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

[Matt Mackall]

On Sat, 2012-07-07 at 21:19 +0200, 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)

Queued for default, thanks.

[backlog 56]

-- 
Mathematics is the supreme nostalgia of our time.