Skip to content
Browse files

mergetool: Fix abort command when resolving symlinks and deleted files

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  • Loading branch information...
1 parent b7b36f9 commit 5a174f1a2ee338172d1ca1dab4e30f5968535f2d @tytso tytso committed
Showing with 4 additions and 4 deletions.
  1. +4 −4 git-mergetool.sh
View
8 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

0 comments on commit 5a174f1

Please sign in to comment.
Something went wrong with that request. Please try again.