diff options
Diffstat (limited to 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 330b036ac9..e338be5e57 100644 --- 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 |