Re: [TSVN] Re: Re: Re: TortoiseMerge bug & feature request

Simon Large wrote:

> Yes. I get a Changed Files window with column headings of
> File, Text Status, Property Status, Remote Text Status, Remote Property
> Status.
>
> It shows me that I have changed another file, but not that I have a WC file
> with unresolved conflict.

Aaaarghhh!
A missing 'break' in a switch statement!

Fixed in revision 1648.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Sep 11 20:14:30 2004