From the mailing list
(http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=28475
34):
When performing a merge that contains a changeset with a file rename, a tree
conflict results. I then proceed to try and figure out whether I can just
delete the file with the tree conflict (i.e. the deleted file in the merged
changeset), and accept the added file. However, I want to know if the
contents of the two files differ, so I want to diff the files.
It would be great if I could just select two files in either the Commit
Dialog or the Check for Modifications Dialog, and diff them. Hopefully this
is explained by the screen capture that follows.
http://old.nabble.com/file/p32550881/Would_Be_Convenient_If_I_Could_Invoke_Diff_
On_These.png
Original issue reported on code.google.com by tortoisesvn on 2 Oct 2011 at 8:36
Original issue reported on code.google.com by
tortoisesvn
on 2 Oct 2011 at 8:36