Merge algorithms

[Eli Zaretskii]

> From: "Stephen J. Turnbull" <stephen at xemacs.org>
> Cc: john at arbash-meinel.com,
>     mbp at canonical.com,
>     bazaar at lists.canonical.com
> Date: Sat, 18 Sep 2010 23:36:12 +0900
> 
> Eli Zaretskii writes:
> 
>  > No, there will be no corruption, because when I merge from
>  > mainline, I need to edit the logs anyway.
> 
> Eli, it's not about *you* Eli, it's about you Emacs developers, some
> of whom are are far less careful than you Eli are.

When I say "I" above, I don't mean Eli, either.