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-mergetool.sh | |
| parent | 365cf979c48a52eec65f29a02a973753418396f4 (diff) | |
| download | git-1346c9996350e96c7b38a57ede5d503821d84fe3.tar.gz git-1346c9996350e96c7b38a57ede5d503821d84fe3.tar.xz | |
mergetool: Make git-rm quiet when resolving a deleted file conflict
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 58794cad4..7a2b9b9f0 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -95,7 +95,7 @@ resolve_deleted_merge () { return ;; [dD]*) - git-rm -- "$path" + git-rm -- "$path" > /dev/null cleanup_temp_files return ;; |