Ubuntu
meld package

  1. Bug #820385
  2. Comment #2

Comment 2 for bug 820385

Revision history for this message
Julian Taylor (jtaylor) wrote :

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