![]() The value of this variable is the command to invoke the merge tool (may specify a script for ease). When specifying a merge.tool value not in the supported list, also specify a mergetool.cmd matching variable. It’s free to use, and does not require using the Perforce server or a license, so anyone can use it.Īs an example, to configure it globally for all Git repos, execute: git config -global merge.tool p4merge Other Merge Tools One of my favorite merge tools is by Perforce: P4Merge. To configure the git merge tool, use: git config merge.tool Example The Git help lists them, and as of this writing they are: Git supports the easy configuration of many merge tools. Some, including Git, allow configuring your favorite merge tool vs forcing use of their own merge tool. ![]() ![]() To help with merges, source control products have a merge tool. Git mergetool: Source merging is inevitable with concurrent development. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |