[PATCH] keyword: use context to detect uncommitted merge

[Martin Geisler]

Christian Ebert <blacktrash at gmx.net> writes:

> # HG changeset patch
> # User Christian Ebert <blacktrash at gmx.net>
> # Date 1275557851 -3600
> # Node ID cecf1545f3a72d5bf0d22e197c54600f5492633d
> # Parent  457813cb30245902ea49f999f6045c21ab87b4d5
> keyword: use context to detect uncommitted merge

Nice, pushed as 0054a328b98f!

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://aragost.com/mercurial/