Add "log merge source" to conflicted files

It would really help out the process of manually resolving text conflicts if I could right-click on a conflicted file and retrieve the log for the merge source.    For example, if I have merged project/branches/dev-1 into project/trunk, and I get text conflicts on project/trunk/foo.txt, I would expect right-clicking on foo.txt to offer the option "Query->Log merged source..." to result in a log of project/branches/dev-1/foo.txt.

Last updated 10 years ago

Hi there,   Thanks for the suggestion. We've got this raised as a future improvement (SU-3241).