[PATCH 5 of 5] rebase: mention conflict in documentation instead of merge

Matt Mackall mpm at selenic.com
Sun Dec 20 17:41:26 CST 2015


On Fri, 2015-12-18 at 12:59 -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless at mozdev.org>
> # Date 1450463535 0
> #      Fri Dec 18 18:32:15 2015 +0000
> # Node ID bfd2df56b16b80d5d4e4d8887221d0495c925319
> # Parent  c3b75502cea61864a9a4f7b9d916443430de09ab
> rebase: mention conflict in documentation instead of merge

These are queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.



More information about the Mercurial-devel mailing list