Resolve conflict during merge

Hello,

when TMerge is started from the "Edit conflict" button in the Resolve Conflict
dialog and the conflict is marked resolved via the "resolved" button in TMerge,
the Resolve Conflict dialog stays open and it's button states remain unchanged.

I would expect the dialog to notice that the conflict was resolved. If that's
not possible, I'd suggest disabling the "resolved" button in TMerge in this case.

Kind regards

Sven

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-10 22:30:26 CET