![]() This is the result: Ĭmd = "/c/Program\\ Files/WinMerge/WinMergeU. git mergetool -tool-help You should see p4merge in either available or valid list. Git allows you to merge all or some of the files from one branch with the files from another branch. And lastly, the options for mergetool are improved. When set to false, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the -no-ff option from the command line). Instead, the tip of the current branch is fast-forwarded. The path to the WinMergeU.exe is adjusted. By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Since I am happy with the Git internal diff tool, I will leave out that configuration. merge tool p4mergetool stat true mergetool 'p4mergetool' cmd /Applications/p4merge. You can provide the absolute path to the p4merge binary, but I have it on PATH because I installed it. To apply this for my machine and scenario, I made some adjustments. Use p4merge from Perforce as default git mergetool. Ĭmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e -dl \"Local\" -dr \"Remote\" $LOCAL $REMOTE $MERGEDĬmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTEĪs was pointed out in the comments, this will work for diff but can potentially provide some trouble for merge. In my research I came across this helpful Gist by Shawn Dumas. Today I wanted to set up WinMerge as default mergetool for Git.
0 Comments
Leave a Reply. |