kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

mergetool: Fix abort command when resolving symlinks and deleted files 

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
maint
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 cleanup_temp_files --save-backup
return return
;; ;;
[rR]*) [rR]*)
git-checkout-index -f --stage=3 -- "$path" git-checkout-index -f --stage=3 -- "$path"
git-add -- "$path" git-add -- "$path"
cleanup_temp_files --save-backup cleanup_temp_files --save-backup
return return
;; ;;
[qQ]*) [aA]*)
exit 1 exit 1
;; ;;
esac esac
@ -94,12 +94,12 @@ resolve_deleted_merge () {
cleanup_temp_files --save-backup cleanup_temp_files --save-backup
return return
;; ;;
[dD]*) [dD]*)
git-rm -- "$path" git-rm -- "$path"
cleanup_temp_files cleanup_temp_files
return return
;; ;;
[qQ]*) [aA]*)
exit 1 exit 1
;; ;;
esac esac