![]() ![]() I'd like to know why it stopped working but they don't have help commands on their shim from what I can tell. I wasn't able to get it working and I am guessing it is because $* isn't passing the arguments in the way they expect. Display line numbers when comparing and merging files. Ĭmd = /Applications/p4merge.app/Contents/MacOS/p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED" Note that in the p4merge docs they say you can use $* with the shim. Recognize line-ending conventions for Windows, Mac, and Unix. For example, if P4V is located in the Applications directory, the you need to use the full path as showed in the example above. Note that git diff will still just use the default inline diff viewer :) (tested with git version 1.8. This works: I changed from using the shim to using the app directly. Note: Under Mac OS X you will need to specify the full path to a specific resource inside P4V.app. Put the following bits in your /.gitconfig, and then you can do git mergetool and git difftool to use p4merge. We refer to this helper application (launchp4merge) as a 'shim'. The command I was using to get it to work pre-Mojave was this: Ĭmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$PWD/$BASE\"" "\"$PWD/$REMOTE\"" "\"$PWD/$LOCAL\"" "\"$PWD/$MERGED\"" There is a small helper application embedded in the P4Merge application that enables running P4Merge from the OS X command line. The worst thing was that it seemed like no one was experiencing this issue. To install P4V and P4Merge, double-click the downloaded file. When I would run the command I got the window for manually merging files. Mac OS X From the Perforce download page, option-click the P4V Download icon and save the file to disk. It's also open source released under the GPL. Pro Free and open source KDiff3 is completely free to download and use. ![]() Pro Supports 3 way merges For modern version control systems, 3way merge support is a basic requirement, but many other open source diff viewers do not adequately handle 3way merges. Well until I had an issue with `git mergetool`. Ive found these instructions for setting up p4merge as my git difftool (I've not been able to test these instructions): brew cask install p4merge git config -global diff.guitool p4mergetool git co. P4Merge works on Windows, Linux and OS X. I recently upgraded to Mac OS X Mojave and have been enjoying it quite a bit. ![]()
0 Comments
Leave a Reply. |