Feature request: Edit Tree Conflicts: Buttons to Show Log and Compare/Merge both of the conflicted files

[dan....@formativhealth.com]

The particular tree conflict I'll use for this example is:
"A merge operation tried to replace a file."

But the same thing applies to many if not all of the merge conflict types.

The full contents of the dialog follow:
"A file which differs from the corresponding file on the merge source branch was found in the working copy.

File merged from
'^/path/path/path/path/path/path/path/path/path/path/file@1234'
to
'^/path/path/path/path/path/path/path/path/path/path/file@1432'
was replaced with a file from another line of history by user in r1324.

-> Postpone
Skip this conflict and leave it unresolved

-> Mark as resolved
Accept current working copy state

Cancel"

It's tedious to track down the contents of the files being referred to here (and most likely this type of conflict is encountered multiple times during the same merge). It's also of great concern that your choice here could be a destructive one where someone's work is removed unintentionally. Please make enhancements here to support the following options:

* Open and view the contents of each of the referenced files
* Show the SVN log related to each of the referenced files
* Compare/merge the referenced files

I can't make an adequate choice without having this information. Besides the tree conflict itself, I need to know the contents of the conflicting files and their history to make an informed decision here.

I don't think I'm alone in feeling that facing this dialog is one of my biggest pain points of SVN.