mergetool: Clean up description of files and prompts for merge resolutions
commit27090aa1eabdc44553a0d8a51ff4ab9543c64c65
authorTheodore Ts'o <tytso@mit.edu>
Thu, 29 Mar 2007 15:39:46 +0000 (29 11:39 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 30 Mar 2007 02:46:16 +0000 (29 22:46 -0400)
tree83d2244e6507325f78eef2f5535d161223f3a7a6
parent1346c9996350e96c7b38a57ede5d503821d84fe3
mergetool: Clean up description of files and prompts for merge resolutions

This fixes complaints from Junio for how messages and prompts are
printed when resolving symlink and deleted file merges.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
git-mergetool.sh