![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Theodore Ts'o <tytso@mit.edu> | |
| Thu, 29 Mar 2007 14:05:02 +0000 (10:05 -0400) | ||
| committer | Theodore Ts'o <tytso@mit.edu> | |
| Thu, 29 Mar 2007 16:29:54 +0000 (12:29 -0400) | ||
| commit | 1346c9996350e96c7b38a57ede5d503821d84fe3 | |
| tree | 7780da18be35f3d7b18def76c7d6102d0557be11 | tree | snapshot |
| parent | 365cf979c48a52eec65f29a02a973753418396f4 | commit | diff |
mergetool: Make git-rm quiet when resolving a deleted file conflict
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| git-mergetool.sh | diff | blob | history |