[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Dmitry <wipedout_at_yandex.ru>
Date: Mon, 15 Mar 2010 12:50:08 +0300

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?



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

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.