Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
tests: squelch noise from GPG machinery set-up
[gitweb.git]
/
git-mergetool--lib.sh
diff --git
a/git-mergetool--lib.sh
b/git-mergetool--lib.sh
index a40d3dfea6799e5a257dc70c82b88cacc62bdcc0..2b6635130a6c6e80cd8d188ae611bf220d25bc0a 100644
(file)
--- a/
git-mergetool--lib.sh
+++ b/
git-mergetool--lib.sh
@@
-221,6
+221,7
@@
run_merge_tool () {
else
run_diff_cmd "$1"
fi
+ status=$?
return $status
}