Remove the selected association between a file type and an external diff or merge tool.
Otherwise, you will be prompted to indicate the success of the resolution after the tool has exited.Įdit the settings of the selected external tool.Ĭonfigure external diff/merge tools associated with a file typeĪdd a file type and configure the diff and external tool that will be used to process files of this type. ( merge tool only) Trust process exit code: select to silently finish the merge if the exitCode of the external merge tool is set to 0 (successful). ( merge tool only) %4: output (merge result) %3: base (the current version without the local changes) Specify the necessary parameters in the proper order: To use one of the pre-configured difftools (for example, 'vimdiff'), you add the following lines to your /. Tool name: enter the name of the external tool that you're configuring.Īrgument pattern: set the diff tool parameters. Git offers a range of difftools pre-configured 'out-of-the-box' (kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, diffuse, opendiff, p4merge and araxis), and also allows you to specify your own. Program path: specify the path to the executable file of the tool you want to use.įor example: C:\Program Files\Beyond Compare 4\BCompare.exe on Windows or /Applications/Beyond Compare.app/Contents/MacOS/bcomp on macOS. Tool group: select whether you want to use a diff or merge tool. In the dialog the opens, configure the following options: Select to use an external tool to compare or merge files or folders.Īdd a new external tool.
0 kommentar(er)
