}
gitk --merge -- "$@" &
-[ "$#" ] && gvim "$@" 2>/dev/null
+# [ "$#" ] && gvim "$@" 2>/dev/null
printf -v files " %s\n" "$@"
conf="a conflict"
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