Andrew's git / gitweb.git / diff
?
mergetool: Clean up description of files and prompts for merge resolutions
authorTheodore Ts'o <tytso@mit.edu>
Thu, 29 Mar 2007 15:39:46 +0000 (11:39 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 30 Mar 2007 02:46:16 +0000 (22:46 -0400)
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>
No differences found