Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
user-manual: Standardize backtick quoting
[gitweb.git]
/
git-mergetool--lib.sh
diff --git
a/git-mergetool--lib.sh
b/git-mergetool--lib.sh
index 330b036ac931198aa1b6e93c3602d2a2cd38291c..e338be5e57e32f52cfa818fd44a6364c00c24cdd 100644
(file)
--- a/
git-mergetool--lib.sh
+++ b/
git-mergetool--lib.sh
@@
-1,6
+1,7
@@
#!/bin/sh
# git-mergetool--lib is a library for common merge tool functions
-MERGE_TOOLS_DIR=$(git --exec-path)/mergetools
+
+: ${MERGE_TOOLS_DIR=$(git --exec-path)/mergetools}
mode_ok () {
if diff_mode