mergetool: Fix abort command when resolving symlinks and deleted files
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o committed
Mar 29, 2007 at 09:48 UTC
5a174f1a2ee338172d1ca1dab4e30f5968535f2d
1 file changed
+4
-4
git-mergetool.sh
+4
-4
@@ -71,13 +71,13 @@ resolve_symlink_merge () {
71
cleanup_temp_files --save-backup
72
return
73
;;
74
- [rR]*)
74
+ [rR]*)
75
git-checkout-index -f --stage=3 -- "$path"
76
git-add -- "$path"
77
cleanup_temp_files --save-backup
78
return
79
;;
80
- [qQ]*)
80
+ [aA]*)
81
exit 1
82
;;
83
esac
@@ -94,12 +94,12 @@ resolve_deleted_merge () {
94
cleanup_temp_files --save-backup
95
return
96
;;
97
- [dD]*)
97
+ [dD]*)
98
git-rm -- "$path"
99
cleanup_temp_files
100
return
101
;;
102
- [qQ]*)
102
+ [aA]*)
103
exit 1
104
;;
105
esac