Re: problem with backed out last change?
Jeff Sparkes wrote:
Anybody else seen this? Maybe I've done something wrong?
[...]
[jsparkes xemacs]$ head man/ChangeLog
<<<<<<< local
2011-05-02 Aidan Kehoe <kehoea(a)parhasard.net>
=======
2011-05-20 Jerry James <james(a)xemacs.org>
>>>>>>> other
<<<<<<< local
* Makefile:
* texinfo.tex:
Merge by hand with the changeset that backed out e82f5b7010fe
No, I think I ran into this, too.
mike
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta