Re: [PATCHv5 3/3] status: don't suggest "git rm" or "git add" if not appropriate

Kong Lucien [off-list ref] writes:

 	# Unmerged paths:
-	#   (use "git add/rm <file>..." as appropriate to mark resolution)
+	#   (use "git add <file>..." to mark resolution)
 	#
 	#	both modified:      main.txt
 	#

This makes me think of another possible improvement (unrelated from this
one). When merging a binary file, one gets

# On branch branch
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       both modified:      binary.bin
#

But no conflict markers, as they would make no sense in the file. Then,
it's a real pain to fix if you're not a Git expert. It would help, in
the presence of binary files, to turn that into :

# Unmerged paths:
#   (use "git checkout --ours [-- path]" to checkout your version)
#   (use "git checkout --theirs [-- path]" to checkout the version being merged)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       both modified:      binary.bin
#

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/