diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2007-03-29 10:05:02 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-03-29 12:29:54 -0400 |
| commit | 1346c9996350e96c7b38a57ede5d503821d84fe3 (patch) | |
| tree | 7780da18be35f3d7b18def76c7d6102d0557be11 /git-svn.perl | |
| parent | mergetool: Add support for Apple Mac OS X's opendiff command (diff) | |
| download | git-1346c9996350e96c7b38a57ede5d503821d84fe3.tar.gz git-1346c9996350e96c7b38a57ede5d503821d84fe3.zip | |
mergetool: Make git-rm quiet when resolving a deleted file conflict
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'git-svn.perl')
0 files changed, 0 insertions, 0 deletions