Re: [PATCH 4/4] doc: Generate a list of valid merge tools
From: John Keeping <hidden>
Date: 2016-06-15 22:55:55
On Sun, Jan 27, 2013 at 01:24:46PM -0800, David Aguilar wrote:
quoted hunk ↗ jump to hunk
--- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh@@ -1,5 +1,6 @@ #!/bin/sh # git-mergetool--lib is a library for common merge tool functions +test -z "$MERGE_TOOLS_DIR" && MERGE_TOOLS_DIR=$(git --exec-path)/mergetools
The preferred pattern in Git seems to be this:
: ${MERGE_TOOLS_DIR=$(git --exec-path)/mergetools}
John