[PATCH] rollback: require --force if there is an uncommitted merge (BC)

[Augie Fackler]

On Jul 7, 2012, at 3:19 PM, Adrian Buehlmann wrote:

> # HG changeset patch
> # User Adrian Buehlmann <adrian at cadifra.com>
> # Date 1341688456 -7200
> # Node ID 8df5c6d2f95b28c2ba1b425f68f33113f16f7738
> # Parent  5d6cbfa975bf2ad0a7b005287617e91e4c38b7b3
> rollback: require --force if there is an uncommitted merge (BC)

Love it!