Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
checkout: constify parameters of checkout_stage() and checkout_merged()
[gitweb.git]
/
git-mergetool.sh
diff --git
a/git-mergetool.sh
b/git-mergetool.sh
index f67bab55e85d00b06601fa488ba01975eb865359..bf862705d8c654a5dd58ec70d6781583b7dbefc3 100755
(executable)
--- a/
git-mergetool.sh
+++ b/
git-mergetool.sh
@@
-413,7
+413,7
@@
done
prompt_after_failed_merge () {
while true
do
- printf "Continue merging other unresolved paths
(y/n)
? "
+ printf "Continue merging other unresolved paths
[y/n]
? "
read ans || return 1
case "$ans" in
[yY]*)