[PATCH] revert: be more helpful on uncommitted merges

[Adrian Buehlmann]

On 2011-06-22 16:05, Adrian Buehlmann wrote:
> # HG changeset patch
> # User Adrian Buehlmann <adrian at cadifra.com>
> # Date 1308749673 -7200
> # Node ID 37ca9f5b44d4f9b722d4103136875eae51ef599b
> # Parent  8deebb5777511369a852e5cb42e69844c40ebf7a
> revert: be more helpful on uncommitted merges

Was meant for stable (if possible)