Re: obsoleting a branch
"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
Michael Sperber writes:
> Does this work for you?
>
>
http://www.selenic.com/mercurial/wiki/index.cgi/TipsAndTricks#head-87ad9e...
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
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta