Enhancement: Button to resolve conflicts with FileMerge

[GoogleCodeExporter]

Would be nice to use FileMerge to modify conflicts. Pressing diff shows the
SVN-Mangled <<<mine/rN files.

It's possible to do (instructions here:
http://daveyshafik.com/archives/681-resolving-svn-conflicts-with-filemergeapp-on
-os-x.html
) though I am unaware as to what command-line params are required (or
however you dictate which files to use)

Would be a *great* enhancement if the Diff button turned into a "Diff
Conflicts" button.

Original issue reported on code.google.com by grahamgr...@googlemail.com on 31 Jan 2010 at 5:46

[GoogleCodeExporter]

Found this link:

http://ssel.vub.ac.be/ssel/internal:fmdiff

Original comment by andrew%c...@gtempaccount.com on 18 Feb 2010 at 5:21

[GoogleCodeExporter]

Expect to see this in a future release.

Original comment by chris...@gmail.com on 3 Apr 2010 at 1:54

• Changed state: Started
• Added labels: Type-Enhancement
• Removed labels: Type-Defect

[GoogleCodeExporter]

Added interactive 'Resolve' button in r131.
Also added `svnx resolve` support.
Works with FileMerge & Araxis Merge.

Original comment by chris...@gmail.com on 5 Apr 2010 at 2:28

• Changed state: Done