Alex Rivera | Logout

What's the best visual merge tool for Git?

Asked 2008-09-26T00:27:35.867
741

What's the best tool for viewing and editing a merge in Git? I'd like to get a 3-way merge view, with "mine", "theirs" and "ancestor" in separate panels, and a fourth "output" panel.

Also, instructions for invoking said tool would be great. (I still haven't figure out how to start kdiff3 in such a way that it doesn't give me an error.)

My OS is Ubuntu.

git version-control merge
Edit
Report

3 Answers

69

I hear good things about kdiff3.

answered 2008-09-26T01:45:09.613
12

If you are just looking for a diff tool beyond compare is pretty nice: http://www.scootersoftware.com/moreinfo.php

answered 2008-09-26T01:50:40.957
3

You can install ECMerge diff/merge tool on your Linux, Mac or Windows. It is pre-configured in Git, so just using git mergetool will do the job.

answered 2010-09-04T12:36:24.970

Your Answer