development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 10:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

mergetool: Fix abort command when resolving symlinks and deleted files

Browse source 
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2007-03-29 09:48:31 -04:00
parent b7b36f92fd
commit 5a174f1a2e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
git-mergetool.sh
View file

@ -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