[PATCH] mergetool: Fix abort command when resolving symlinks and deleted files
From: Theodore Ts'o <tytso@mit.edu>
Date: 2016-06-15 22:43:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> --- git-mergetool.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 5de2433..f73072a 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh@@ -73,13 +73,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
@@ -96,12 +96,12 @@ resolve_deleted_merge () { cleanup_temp_files --save-backup return ;; - [dD]*) + [dD]*) git-rm -- "$path" cleanup_temp_files return ;; - [qQ]*) + [aA]*) exit 1 ;; esac
--
1.5.1.rc2.1.g8afe-dirty