Re: resolve conflict dialog is confusing

> Yep, I'd agree with that as well, but IIRC, "edit conflicts" only uses
> the not so helpful terms "mine" and "theirs". I many cases, "mine"
> might apply to both sides or no side at all.

Just got the dialog again and checked. In fact, it is even worse.
TortoiseMerge does indeed use "Theirs" and "Mine" (confusing) but on
top of that, it shows "Theirs" on the left, while the corresponding
button "Prefer repo" is on the right and vice versa. That seems easy
to fix.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2859464

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-20 09:59:48 CEST