[PATCH 2 of 2] merge: adds documentation to the mergestate class

[Matt Mackall]

On Wed, 2014-03-05 at 11:05 -0800, pierre-yves.david at ens-lyon.org wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at fb.com>
> # Date 1394045383 28800
> #      Wed Mar 05 10:49:43 2014 -0800
> # Node ID 7760e02d58f2f00dd944ce585af63b8e05cfc69f
> # Parent  37d4c6705c2470d788ad9ed4af3d1d6f27400032
> merge: adds documentation to the mergestate class

Queued after removing UTF-8. Not sure about your Python, but mine chokes
on it.

-- 
Mathematics is the supreme nostalgia of our time.