mergetool: Fix abort command when resolving symlinks and deleted files

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-03-29 09:48:31 -04:00
parent b7b36f92fd
commit 5a174f1a2e
1 changed files with 4 additions and 4 deletions
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@ -77,7 +77,7 @@ resolve_symlink_merge () {
 		cleanup_temp_files --save-backup
 		return
 		;;
-	    [qQ]*)
+	    [aA]*)
 		exit 1
 		;;
 	    esac
@ -99,7 +99,7 @@ resolve_deleted_merge () {
 		cleanup_temp_files
 		return
 		;;
-	    [qQ]*)
+	    [aA]*)
 		exit 1
 		;;
 	    esac