Anybody else seen this? Maybe I've done something wrong? [jsparkes xemacs]$ hg pull xemacs pulling from ssh://sperber-guest＠hg.debian.org//hg/xemacs/xemacs searching for changes adding changesets adding manifests adding file changes added 2 changesets with 4 changes to 2 files (run 'hg update' to get a working copy) [jsparkes xemacs]$ hg update merging man/ChangeLog warning: conflicts during merge. merging man/ChangeLog failed! 30 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [jsparkes xemacs]$ hg resolve -l U man/ChangeLog [jsparkes xemacs]$ [jsparkes xemacs]$ [jsparkes xemacs]$ hg resolve -l U man/ChangeLog [jsparkes xemacs]$ head man/ChangeLog <<<<<<< local 2011-05-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; ======= 2011-05-20 Jerry James <james(a)xemacs.org&gt; <<<<<<< local * Makefile: * texinfo.tex: Merge by hand with the changeset that backed out e82f5b7010fe _______________________________________________ XEmacs-Beta mailing list XEmacs-Beta(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-beta