RE: Re: TortoiseMerge produces unpredictable result
From: Sven Strickroth <tigris_at_cs-ware.de>
Date: Sat, 22 Jun 2013 03:02:40 -0700 (PDT)
Actually, I would expect a different visualization on the left view.
It's true that all lines are in conflict, however, I would expect to see changes from base to theirs on the left view - i.e. that only the one line is changed (in the example from 3 to 3a). Especially in a conflict I want to see the changes from "base" to "theis" and "my" in order to be able to decide which lines I need from which file. Right now there is no way to see that only one line changed in "base" to "theirs" (in a longer file) - it looks as if the whole file changed.
This does not only apply to this specific case, but here it was very visible to me that it should look different.
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
|
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.