resolve conflict dialog is confusing

in the 'Resolve Conflict' dialog that shows during a merge there are
two buttons:

- Use local
- Use repository

the wording of these buttons is ambguous and confusing.

the term 'repository' is ambiguous since both branches are in the
repository, and this button does not disambiguate between them.

the term 'local' sin't much better - does it refer to my working copy
before the merge, the working copy after the failed merge, some other
local copy?

also, can we get accelerators for these (all!) buttons?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-19 21:00:02 CEST