6 git-mergetool--lib - Common git merge tool shell scriptlets
10 'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"'
15 This is not a command the end user would want to run. Ever.
16 This documentation is meant for people who are studying the
17 Porcelain-ish scripts and/or are writing new ones.
19 The 'git-mergetool--lib' scriptlet is designed to be sourced (using
20 `.`) by other shell scripts to set up functions for working
23 Before sourcing 'git-mergetool--lib', your script must set `TOOL_MODE`
24 to define the operation mode for the functions listed below.
25 'diff' and 'merge' are valid values.
33 returns the custom command for a merge tool.
36 returns the custom path for a merge tool.
39 launches a merge tool given the tool name and a true/false
40 flag to indicate whether a merge base is present.
41 '$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined
42 for use by the merge tool.
46 Written by David Aguilar <davvid@gmail.com>
50 Documentation by David Aguilar and the git-list <git@vger.kernel.org>.
54 Part of the linkgit:git[1] suite