Comment on Meld - a great visual diff and merge tool for linuxComments−cookiecaper15yI prefer Kompare: http://www.kde.org/applications/development/kompare/−gnosis15yUnfortunately, it doesn't look like the stable version is capable of 3-way merges.Glad to see they're working on implementing that feature, though.
Comments
I prefer Kompare: http://www.kde.org/applications/development/kompare/
Unfortunately, it doesn't look like the stable version is capable of 3-way merges.
Glad to see they're working on implementing that feature, though.