Re: Suggestion: Display M-to-N lines replacement as one change instead of two

Jean-Marc wrote:
>In addition, it also makes it more difficult to properly resolve
>conflicts, as the effect of 'use their before mine' (or 'mine before
>their') results in mixing the changes instead of actually placing one
>change before the other.

Does the current implementation (r18742) resolve those problems?

Dmitry.

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-15 10:50:12 CET