diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2007-03-29 15:48:31 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-03-29 18:29:52 +0200 |
| commit | 5a174f1a2ee338172d1ca1dab4e30f5968535f2d (patch) | |
| tree | de91b624df26d0721831793aecc7288f613d2cbd /git-mergetool.sh | |
| parent | mergetool: Remove spurious error message if merge.tool config option not set (diff) | |
| download | git-5a174f1a2ee338172d1ca1dab4e30f5968535f2d.tar.xz git-5a174f1a2ee338172d1ca1dab4e30f5968535f2d.zip | |
mergetool: Fix abort command when resolving symlinks and deleted files
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index c1fde41a08..9b736507be 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -71,13 +71,13 @@ resolve_symlink_merge () { cleanup_temp_files --save-backup return ;; - [rR]*) + [rR]*) git-checkout-index -f --stage=3 -- "$path" git-add -- "$path" cleanup_temp_files --save-backup return ;; - [qQ]*) + [aA]*) exit 1 ;; esac @@ -94,12 +94,12 @@ resolve_deleted_merge () { cleanup_temp_files --save-backup return ;; - [dD]*) + [dD]*) git-rm -- "$path" cleanup_temp_files return ;; - [qQ]*) + [aA]*) exit 1 ;; esac |