[PATCH 2 of 3] update: allow branch crossing without -c or -C, with no uncommitted changes

[Greg Ward]

On Sun, Nov 1, 2009 at 11:46 PM, Stuart W Marks <smarks at smarks.org> wrote:
> # HG changeset patch
> # User Stuart W Marks <smarks at smarks.org>
> # Date 1257136299 28800
> # Node ID 58f691f2d5aa6d0484ffb165e16ac5ca29fdbdc9
> # Parent  805cd5252f7509e3dd5df39555f07ff4d58705b3
> update: allow branch crossing without -c or -C, with no uncommitted changes

Good stuff.  Very good stuff.  I don't feel qualified to review the
change to merge.py, but it makes sense to me.  And I can attest that
your test changes make sense and the relevant tests still pass (once I
workaround the bash syntax).

And your patch #3 is excellent too.  No further changes required IMHO.

Greg