This is the default if the merge resolution program is explicitly specified with the -tool option or with the merge.tool Print a list of merge tools that may be used with -tool.ĭon’t prompt before each invocation of the merge resolution program. Git mergetool will prompt the user to indicate the success of the resolution after the custom tool has exited. If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable ustExitCode can be set to true. To the name of a temporary file containing the contents of the file to be merged, and $MERGED set to the name of the file to which the merge tool should write the result of the merge resolution. Name of a temporary file containing the common base for the merge, if available $LOCAL set to the name of a temporary file containing the contents of the file on the current branch $REMOTE set When git mergetool is invoked with this tool (either through the -t or -tool option or the merge.tool configuration variable) the configured command line will be invoked with $BASE set to the Instead of running one of the known merge tool programs, git mergetool can be customized to run an alternative program by specifying the command line to invoke in a configuration variable Otherwise, git mergetool assumes the tool is available in PATH. For example, you can configure the absolute path to kdiff3 by setting
#GIT FILE MERGE TOOL FULL#
You can explicitly provide a full path to the tool by setting the configuration variable mergetool.path. If the configuration variable merge.tool is not set, git mergetool will pick a If a merge resolution program is not specified, git mergetool will use the configuration variable merge.tool.
0 kommentar(er)
