do_build: stop a failing "kill" from killing the whole here-script

[next-scripts] / merge_msg

diff --git a/merge_msg b/merge_msg
index e5d80ece7690df283794f4b049c5641ffabaa922..38e6e2e6113d3494806c5163e24009a946c097b3 100755 (executable)
--- a/merge_msg
+++ b/merge_msg
@@ -7,7 +7,7 @@ branch=""
 }
 
 gitk --merge -- "$@" &
-[ "$#" ] && gvim "$@" 2>/dev/null
+# [ "$#" ] && gvim "$@" 2>/dev/null
 
 printf -v files "  %s\n" "$@"
 conf="a conflict"
@@ -33,7 +33,12 @@ from the FIXME tree and commit:
 
 from the BRANCH tree.
 
-I fixed it up (see below) and can carry the fix as necessary (no action is required).
+I fixed it up (see below) and can carry the fix as necessary. This
+is now fixed as far as linux-next is concerned, but any non trivial
+conflicts should be mentioned to your upstream maintainer when your tree
+is submitted for merging.  You may also want to consider cooperating
+with the maintainer of the conflicting tree to minimise any particularly
+complex conflicts.
 EOF
 
 exit 0