Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
get_ref_dir(): change signature
[gitweb.git]
/
git-mergetool--lib.sh
diff --git
a/git-mergetool--lib.sh
b/git-mergetool--lib.sh
index 8fc65d0400545e30fd56f890e6b17052f54f857c..ed630b208a80a36d729b5074a39bc53df0cabd59 100644
(file)
--- a/
git-mergetool--lib.sh
+++ b/
git-mergetool--lib.sh
@@
-21,7
+21,7
@@
check_unchanged () {
do
echo "$MERGED seems unchanged."
printf "Was the merge successful? [y/n] "
- read answer
+ read answer
|| return 1
case "$answer" in
y*|Y*) status=0; break ;;
n*|N*) status=1; break ;;