table of contents
other versions
- wheezy 1:1.7.10.4-1+wheezy3
- wheezy-backports 1:1.9.1-1~bpo70+2
- jessie 1:2.1.4-2.1+deb8u2
- jessie-backports 1:2.11.0-3~bpo8+1
- testing 1:2.11.0-3
- unstable 1:2.11.0-4
- experimental 1:2.13.1+next.20170610-1
GIT-MERGETOOL--LI(1) | Git Manual | GIT-MERGETOOL--LI(1) |
NAME¶
git-mergetool--lib - Common git merge tool shell scriptletsSYNOPSIS¶
TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"
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.FUNCTIONS¶
get_merge_toolreturns 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.
GIT¶
Part of the git(1) suite03/19/2016 | Git 1.7.10.4 |