Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
blame: improve diagnosis for "--reverse NEW"
[gitweb.git]
/
git-mergetool--lib.sh
diff --git
a/git-mergetool--lib.sh
b/git-mergetool--lib.sh
index 54ac8e484674710ca21ea0038d07dcbefbe2fb1e..92adcc0d0785f8b78fce2c49bbcc40e49020ee24 100644
(file)
--- a/
git-mergetool--lib.sh
+++ b/
git-mergetool--lib.sh
@@
-100,7
+100,7
@@
check_unchanged () {
while true
do
echo "$MERGED seems unchanged."
- printf "Was the merge successful
? [y/n]
"
+ printf "Was the merge successful
[y/n]?
"
read answer || return 1
case "$answer" in
y*|Y*) return 0 ;;