1. NAME▲
git-mergetool--lib - Common git merge tool shell scriptlets
2. SYNOPSIS ▲
TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetoollib"
3. DESCRIPTION ▲
This is not a command the end user would want to run. Ever. This documentation is meant for people who are studying the Porcelain-ish scripts and/or are writing new ones.
The git-mergetool--lib scriptlet is designed to be sourced (using .) by other shell scripts to set up functions for working with git merge tools.
Before sourcing git-mergetool--lib, your script must set TOOL_MODE to define the operation mode for the functions listed below. diff and merge are valid values.
4. FUNCTIONS ▲
get_merge_tool
returns a merge tool.
get_merge_tool_cmd
returns the custom command for a merge tool.
get_merge_tool_path
returns the custom path for a merge tool.
run_merge_tool
launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present. $MERGED, $LOCAL, $REMOTE, and $BASE must be defined for use by the merge tool.
5. AUTHOR ▲
Written by David Aguilar <\m[blue]\\fR\m[]\s-2\u[1]\d\s+2>
6. DOCUMENTATION ▲
Documentation by David Aguilar and the git-list <\m[blue]\\fR\m[]\s-2\u[2]\d\s+2>.
7. GIT ▲
Part of the git(1) suite
8. NOTES ▲
1. 4
mailto:
2. 4
mailto: