A Cry For Sanity

[Christian Thalinger]

On Wed, 2008-06-25 at 23:29 +0100, Andrew John Hughes wrote:
> * When merging between trees, Mercurial tries to merge these files.
> It's more an annoyance than everything, but I have to quit the editor,
> tell it the merge was successful, then regenerate them.

Yeah, I had that a million times back than when I worked on the cacao
branches.  Finally I switched to:

[ui]
merge = merge

But, yes, I also want them to be removed.

- twisti