[PATCH 1 of 2] rebase: add test for in-memory merge conflicts

Pulkit Goyal 7895pulkit at gmail.com
Fri Aug 17 07:37:29 EDT 2018


On Fri, Aug 17, 2018 at 4:34 AM Yuya Nishihara <yuya at tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1534468757 -32400
> #      Fri Aug 17 10:19:17 2018 +0900
> # Node ID e338a921a0cdc60717e5aebc7dc4bb9ba203478d
> # Parent  06baaf43c9599534ffe3b6ecd3275e68abe68c34
> rebase: add test for in-memory merge conflicts
>

Queued this series, many thanks!
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20180817/53a9e440/attachment.html>


More information about the Mercurial-devel mailing list