[T-Merge] After use mark as resolved, dialog apears

Using latest full nightly

What I did: Open conflict file in TortoiseMerge using "Edit conflict"
command. Resolve all conflict e.g. using use this whole file command.
Use "mark as resolved".

What I get: TortoiseMerge After use "mark as resolved" button from
ribbon show dialog "File has no conflicts", "mark as resolved".

What I expect: When pressing resolved, I want to mark as resolved
without questions. (In case of unresolved conflict I expect dialog).

Otik

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-05-17 10:43:05 CEST