Re: Mercurial: automatically merge ChangeLogs
Jerry James <james(a)xemacs.org> writes:
With CVS, we got automatic ChangeLog merging, which I liked. I
don't
get that, out of the box at least, with Mercurial. Is there some way
to set it up?
setting HGMERGE to just "merge" (or doing the equivalent thing in .hgrc)
gives you behavior that's pretty much identical to what CVS did. (Like
Stephen, I never saw CVS automatically resolving ChangeLog conflicts.)
--
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