Currently, the filenames during merging are filename.working (mine) filename.merge-left.rABCD (base) filename.merge-right.rEFGH (theirs)
I am using BeyondCompare 4 for file comparison and merge, which is more comfortable than TortoiseMerge. BC4 shows the "mine" on the left top, "theirs" on the right top, "base" on the center top, and "merged" on the bottom. This is fine, but the filenames you use are confusing. What is "left" and "right"? This has no useful meaning. I suggest that you use .working --> .merge-mine .merge-left.rABCD --> .merge-base .merge-right.rEFGH --> .merge-theirs This change should be easy to do and you can keep searching for the old names for backwards compatibility. -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/dd5d202e-66ff-47e5-9b97-485c7ab90276%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
