![]() If I wanted to use the built-in Visual Studio diff/merge tool, I could change the tool = statement for each so that it specifies vsdiffmerge instead. In the above case, I specified araxisdiff as my diff tool and araxismerge as my merge tool. What's going on is rather straightforward: The section specifies which of the entries will be used for file compares the section specifies which of the entries will be used for file merges. I suggest removing your existing, ,, and sections and replacing them so that your gitconfig file looks something like this: Ĭmd = \"C:\\Program Files\\Araxis\\Araxis Merge\\Merge.exe\" \"$LOCAL\" \"$REMOTE\"Ĭmd = \"C:\\Program Files\\Araxis\\Araxis Merge\\Merge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"Ĭmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |