When doing a three way merge after resolving a merge conflict from the latest SVN updates, I'm displaying my old SVN copy in the left, my current copy in the center, and the latest SVN copy on the right. Underneath the three windows is the merge result. It seems that the merge result favours the left panel. I could re-arrange my windows so that my current copy is on the left, but I'd rather keep it in the center. Is there a way for it to favour the center panel?
Thanks, Eric
PS: Bld444, cmdline="%base %theirs %mine /lro /rro /cro /mergeoutput=%merged"
Thanks, Eric
PS: Bld444, cmdline="%base %theirs %mine /lro /rro /cro /mergeoutput=%merged"
Comment