problem with backed out last change?

[Mike Kupfer]

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 at parhasard.net>
> =======
> 2011-05-20  Jerry James  <james at 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