Reverting a single commit

[Eli Zaretskii]

> Date: Sat, 17 Jul 2010 06:50:41 -0400
> From: John Szakmeister <john at szakmeister.net>
> Cc: bazaar at lists.canonical.com
> 
> The catch here is that the X-1 is exclusive rather than inclusive.

Right, the exclusive part is what I was missing.

> The docs might do a better job at talking about advanced merging in general:
>    <http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/adv_merging.html>

Thanks.