aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-03-29 09:48:31 -0400
committerTheodore Ts'o <tytso@mit.edu>2007-03-29 12:29:52 -0400
commit5a174f1a2ee338172d1ca1dab4e30f5968535f2d (patch)
treede91b624df26d0721831793aecc7288f613d2cbd
parentb7b36f92fd096d1ff0d4cccd8980c93c3bff4fa8 (diff)
downloadgit-5a174f1a2ee338172d1ca1dab4e30f5968535f2d.tar.gz
git-5a174f1a2ee338172d1ca1dab4e30f5968535f2d.tar.xz
mergetool: Fix abort command when resolving symlinks and deleted files
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rwxr-xr-xgit-mergetool.sh8
1 files changed, 4 insertions, 4 deletions
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