3 ms·
It works with git??? I had no idea. I highly recommend anyone reading this to try out P4merge as the merge conflict resolver for git. It might be the better alt
by ninetyninenine 2y ago
It works with git??? I had no idea. I highly recommend anyone reading this to try out P4merge as the merge conflict resolver for git. It might be the better alternative to jetbrains as jetbrains usually involves buying into using the entire editor.
- oniony 2y agoYup, you can get it from https://www.perforce.com/products/helix-core-apps/merge-diff-tool-p4merge https://www.perforce.com/products/helix-core-apps/merge-diff.... I actually use Difftastic on the command-line for diffs and spit out to P4Merge for merges. Here's my Jujutsu config: [ui] diff.tool = ["difft", "--color=always", "--display=side-by-side-show-both", "$left", "$right"] merge-editor = ["/Applications/p4merge.app/Contents/MacOS/p4merge", "-nl", "Theirs", "-nb", "Base", "-nr", "Mine", "$base", "$left", "$right", "$output" ]
- WolfeReader 2y agoI started using this today, and it's pretty amazing. Thank you!