Set to the name of the file to which the merge tool should write the result of the merge resolution. Set to the name of a temporary file containing the contents of the file to be merged, and Set to the name of a temporary file containing the contents of the file on the current branch Set to the name of a temporary file containing the common base for the merge, if available Is invoked with this tool (either through theĬonfiguration variable) the configured command line will be invoked with Instead of running one of the known merge tool programs,Ĭan be customized to run an alternative program by specifying the command line to invoke in a configuration variable For example, you can configure the absolute path to kdiff3 by setting
Use araxis merge with git full#
You can explicitly provide a full path to the tool by setting the configuration variable If a merge resolution program is not specified, Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, diffuse, tortoisemerge, opendiff, p4merge and araxis.
Use the merge resolution program specified by. If no names are specified, git mergetool will run the merge tool program on every file with merge conflicts. If one or more parameters are given, the merge tool program will be run to resolve differences on each file. Use git mergetool to run one of several merge utilities to resolve merge conflicts. Git-mergetool - Run merge conflict resolution tools to resolve merge conflicts