meld can do 3-way-diffs but I don't think it can do it from a working copy with a postponed conflict. You have to write a wrapper script for meld and set SVN_MERGE before doing svn up. When asked for action launch the external tool. see this thread for an example: http://ubuntuforums.org/showthread.php?t=1427287
-- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/820385 Title: Meld doesn't display subversion "conflicts" correctly To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/meld/+bug/820385/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
