[PATCH] merge: improve clarity of table in update docstring

[Matt Mackall]

On Fri, 2015-10-23 at 06:06 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <augie at google.com>
> # Date 1445594782 14400
> #      Fri Oct 23 06:06:22 2015 -0400
> # Branch stable
> # Node ID 27683c63f44cb58d02df2d4dc16f5ba3348d394c
> # Parent  71d5238f92e9ab5cc6b1677d4ba48903fc939f01
> merge: improve clarity of table in update docstring

Queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.