Re: some bzrmerge.el questions

[Stefan Monnier]

>> Unfortunately after resolving many text conflicts I ran into
> Oh well, I see you merged it, up to exactly the same point I was
> working on.  At least I might know what to do next time.

Sorry.  BTW, I also committed a change to smerge, which I used to
automate most of the conflict resolution (there was tons of spurious
conflicts with the copyright year update, as you must know, and most of
them could be resolved automatically).

> BTW, the ChangeLog piece often includes too much - see the corrections
> I just installed. Sometimes it duplicates existing items, often it
> includes one line too many.

Sounds like a bug in change-log-resolve-conflict.  If you could take
a look at it and try and figure out how to solve/detect/avoid the
problems you've seen, that would be very helpful.


        Stefan