[PATCH] Skip 3-way merge is both ancestors are equal.

[Bryan O'Sullivan]

On Mon, 2005-11-07 at 14:11 -0500, Daniel Santa Cruz wrote:

> +        if base == other:
> +            self.ui.debug(_("file %s: other (%s) and ancestor (%s)
> are identical\n") %
> +                              (fn, shor(other), short(base)))
> +            return

This looks like it wasn't tested.  I see a typo.

	<b