X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=merge_msg;h=38e6e2e6113d3494806c5163e24009a946c097b3;hb=952496f42386d431c519751fe58c574b5513bcae;hp=62227bdd2f84df0590fb4294688837366e613308;hpb=61a2ece8f71511628463cb3f65dad2c271ccc696;p=next-scripts

diff --git a/merge_msg b/merge_msg
index 62227bd..38e6e2e 100755
--- a/merge_msg
+++ b/merge_msg
@@ -6,17 +6,13 @@ branch=""
         shift 2
 }
 
-file="$*"
-
-gitk --merge -- $file &
-[ "$file" ] && gvim $file 2>/dev/null
+gitk --merge -- "$@" &
+# [ "$#" ] && gvim "$@" 2>/dev/null
 
+printf -v files "  %s\n" "$@"
 conf="a conflict"
-[ "$#" -gt 1 ] && {
-	file=${file// /, }
-	file=$(echo $file | sed 's/,\([^,]*\)$/ and\1/')
+[ "$#" -gt 1 ] &&
 	conf="conflicts"
-}
 
 subject="manual merge of the BRANCH tree with the FIXME tree"
 
@@ -26,8 +22,7 @@ FIXME: Add owner of second tree to To:
 
 Today's linux-next merge of the BRANCH tree got $conf in:
 
-  $file
-
+$files
 between commit:
 
    ("")
@@ -38,8 +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