10

I'm a fan of the 4-pane approach to 3-way file merging. In particular, being able to see Branch A, Branch B, and the ancestor of A and B in 3 read-only panes, then a 4th read-write pane which shows the results of your merge.

However, I've been unable to find a 4-pane merge tool for Mac OSX that I can integrate with mercurial/git. Does such a beast exist?

Community
  • 1
  • 1
emmby
  • 95,927
  • 63
  • 178
  • 243
  • 1
    It's not actually clear to me what you mean when you say that you are a fan of the 4-pane approach (the linked question is about two different 4-pane approaches, and it's not clear which one you want). Having said that, take a look at [kdiff](http://kdiff3.sourceforge.net/) and see if that does the trick. – Ista May 16 '11 at 19:49
  • I believe the linked question has two different 3-way diff approaches: one is 3-pane, and the other is 4-pane. I prefer the 4-pane – emmby May 16 '11 at 20:15
  • Here is a [screen shot](http://www.scootersoftware.com/moreinfo.php?zz=screenshot&shot=TextMerge) of what I think he means by a 3-Way Merge with 4 Panes. –  May 16 '11 at 20:20
  • 1
    kdiff3's mac interface and command line integration leaves much to be desired compared to other tools, but yes, that's what I mean by 4 panes. – emmby May 17 '11 at 00:25

3 Answers3

14

The tool you are looking for is p4merge. Git has native support for it.

neu242
  • 14,861
  • 13
  • 69
  • 107
5

My first thought was to suggest KDiff3, since it does have 4 panes for 3-way merges and can be integrated with git (see here and here), but from the comments you seem to not consider it an option. I am a bit curios why, because I like KDiff3 a lot and it fits my needs.

Community
  • 1
  • 1
hlovdal
  • 23,353
  • 10
  • 78
  • 148
  • It's not not an option per se, but I find it much clunkier than say FileMerge.app, Changes.app, or Araxis Merge. It also spits a lot of cruft out on the command line when you call it from the terminal or from within hg merge. – emmby May 18 '11 at 19:04
  • 2
    I my experience kdiff3 looks less polished but does do the job perfectly. – fatuhoku Apr 16 '13 at 13:43
0

VIM!

see macvim.org

seler
  • 7,311
  • 3
  • 35
  • 52
  • macvim.org hasn't been updated since 2009. Check out http://code.google.com/p/macvim/ for the updated version. – neu242 Apr 17 '13 at 12:32
  • a vim plugin for 4-pane merging (base, local, remote, output) is https://github.com/sjl/splice.vim (however no commits since 11/2013) – Hotschke Apr 22 '16 at 10:07