Re: Major change in conflict handling between 1.12.9 and 1.12.13?

[Steve McIntyre]

On Tue, May 30, 2006 at 12:43:31AM +0100, Steve McIntyre wrote:
>Hi,
>
>I've updated from 1.12.9 to 1.12.13 and I'm seeing a *really* major
>change in behaviour when conflicts happen; a merge conflict is only
>reported during the merge itself. The conflict marker itself is then
>lost on subsequent calls to update.

<snip>

>I can't believe this change was deliberate; it's rather worrying, and
>it breaks normal workflow - I've had several user complaints
>already. Should I raise a bug?

Any response from the developers? Derek? Mark?

-- 
Steve McIntyre, Cambridge, UK.                                address@hidden
"I can't ever sleep on planes ... call it irrational if you like, but I'm
 afraid I'll miss my stop" -- Vivek Dasmohapatra