diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-12 14:22:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-12 14:22:59 -0800 |
| commit | 694a88a309c74ffeefa9a0db0396ee4c168a521c (patch) | |
| tree | 79007f8bcf98505df2e4cf423ac7307535c1b2d1 /git-mergetool--lib.sh | |
| parent | Merge branch 'cn/thin-push-capability' (diff) | |
| parent | remove #!interpreter line from shell libraries (diff) | |
| download | git-694a88a309c74ffeefa9a0db0396ee4c168a521c.tar.gz git-694a88a309c74ffeefa9a0db0396ee4c168a521c.zip | |
Merge branch 'jn/scripts-updates'
* jn/scripts-updates:
remove #!interpreter line from shell libraries
test: replace shebangs with descriptions in shell libraries
test: make FILEMODE a lazy prereq
contrib: remove git-p4import
mark contributed hooks executable
mark perl test scripts executable
mark Windows build scripts executable
Diffstat (limited to 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index a280f49817..c45a020301 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -1,5 +1,4 @@ -#!/bin/sh -# git-mergetool--lib is a library for common merge tool functions +# git-mergetool--lib is a shell library for common merge tool functions : ${MERGE_TOOLS_DIR=$(git --exec-path)/mergetools} |