From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 29 Mar 2007 13:48:31 +0000 (-0400)
Subject: mergetool: Fix abort command when resolving symlinks and deleted files
X-Git-Tag: v1.5.1~19^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5a174f1a2ee338172d1ca1dab4e30f5968535f2d;p=git.git

mergetool: Fix abort command when resolving symlinks and deleted files

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/git-mergetool.sh b/git-mergetool.sh
index c1fde41a0..9b736507b 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