OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'nf/mergetool-prompt'
[git-core/git.git]
/
git-mergetool.sh
diff --git
a/git-mergetool.sh
b/git-mergetool.sh
index
f67bab5
..
bf86270
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]*)