obsoleting a branch

[Michael Sperber]

"Stephen J. Turnbull" <stephen at xemacs.org> writes:

> Michael Sperber writes:
>
>  > Does this work for you?
>  > 
>  > http://www.selenic.com/mercurial/wiki/index.cgi/TipsAndTricks#head-87ad9ed806ca450142202c953b9b16ca2d0d8fa9
>
> Not well, it barfs if there is a conflict.  I guess that can be worked
> around, but yeech.

Ah - I think you can work around that by prefixing with

env HGMERGE=/bin/true

(I just use regular merge, so I don't even the problem, as the "hg
revert" gets rid of gthe conflict product.)

-- 
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla