Committing conflicts

[Stefan Monnier]

> I would hate to promise anything, but cp .bzr/checkout/conflicts might
> be a way to snapshot the state.  And copying that into the next
> checkout would inform bzr that things are still conflicted.

Interesting, thanks.  Of course, there's still all the problems with
saving the aux-files (like *.BASE, ...), but I hadn't thought of
.bzr/checkout/conflicts.


        Stefan