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"
$(dirname $0)/message_helper $branch "$subject" <<EOF
-Today's linux-next merge of the BRANCH tree got $conf in:
+FIXME: Add owner of second tree to To:
+ Add author(s)/SOB of conflicting commits.
- $file
+Today's linux-next merge of the BRANCH tree got $conf in:
+$files
between 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