mergetool: Make git-rm quiet when resolving a deleted file conflict
commit1346c9996350e96c7b38a57ede5d503821d84fe3
authorTheodore Ts'o <tytso@mit.edu>
Thu, 29 Mar 2007 14:05:02 +0000 (29 10:05 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 29 Mar 2007 16:29:54 +0000 (29 12:29 -0400)
tree7780da18be35f3d7b18def76c7d6102d0557be11
parent365cf979c48a52eec65f29a02a973753418396f4
mergetool: Make git-rm quiet when resolving a deleted file conflict

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