[PATCH 2 of 2] update: for "noconflict" updates, print "conflicting changes" on conflict

Yuya Nishihara yuya at tcha.org
Tue Mar 7 08:40:55 EST 2017


On Mon, 06 Mar 2017 23:50:38 -0800, Martin von Zweigbergk via Mercurial-devel wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1488871287 28800
> #      Mon Mar 06 23:21:27 2017 -0800
> # Node ID 426835372fed3048a413eb210ed527886912cbfc
> # Parent  76aa7c5b624792a316c6e028b77a59aee95e5a3b
> update: for "noconflict" updates, print "conflicting changes" on conflict

Thanks, queued these.

(I only read the first paragraph of Ryan's comment, so missed this one.)


More information about the Mercurial-devel mailing list