X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-mergetool--lib.sh;h=51dd0d67ba951873df4f26b1707a1e8a713082b9;hb=48c250a121a425a1860226b6a7061aecfbab5246;hp=5b6278572a48569a806a5a976cdd08eb7c117fb7;hpb=410e99fadf25b65b70d9bf90fd8bd5a5d1ea3c8a;p=git.git diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 5b6278572..51dd0d67b 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -1,3 +1,4 @@ +#!/bin/sh # git-mergetool--lib is a library for common merge tool functions diff_mode() { test "$TOOL_MODE" = diff