Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
pack-objects: use reachability bitmap index when generating non-stdout pack
[gitweb.git]
/
git-mergetool--lib.sh
diff --git
a/git-mergetool--lib.sh
b/git-mergetool--lib.sh
index 302c56de5b6ceb96e1eb075f9e208a655dcb9c9e..9abd00be212b3e55883c0f9fa0487c7b31a6039f 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 ;;