Re: TortoiseMerge whitespace options and conflicts
From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: 2007-07-10 23:19:50 CEST
On 10/07/07, Graham Bloice <gbloice@gmail.com> wrote:
In the trunk build it doesn't hide them. I don't have 1.4.x installed
> 2. Can anyone explain why the conflict markers were not removed. My best
When you mark as resolved it is assumed that you have sorted out the
> 3. Not really a TSVN question, but how does svn determine that a conflict
Now there's an interesting question. If you delete the ancillary
Simon
-- ___ oo // \\ "De Chelonian Mobile" (_,\/ \_/ \ TortoiseSVN \ \_/_\_/> The coolest Interface to (Sub)Version Control /_/ \_\ http://tortoisesvn.net --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org For additional commands, e-mail: users-help@tortoisesvn.tigris.orgReceived on Tue Jul 10 23:19:23 2007 |
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.