From 5a174f1a2ee338172d1ca1dab4e30f5968535f2d Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 29 Mar 2007 09:48:31 -0400 Subject: [PATCH] mergetool: Fix abort command when resolving symlinks and deleted files Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 8 ++++---- 1 file 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