Mercurial: automatically merge ChangeLogs

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? I would like to avoid what I just went through. I pulled in the latest changes, got a merge conflict on two ChangeLogs, and then had to figure out how to use meld (the tool selected by mercurial). That very nice program silently changed the encoding of the merged file from ISO8859-1 to UTF-8 without even asking me, and also added a blank line at the end. Niiiiiiiiiice. -- Jerry James http://www.jamezone.org/ _______________________________________________ XEmacs-Beta mailing list XEmacs-Beta(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta