diff tests/test-template-map.t @ 42338:78530404d00b

convert: demonstrate broken {files} list in merge commits with file flags When there is a merge in which the flags for a file from p2 is non-empty, `hg convert` will incorrectly include that in the changeset's files list. Differential Revision: https://phab.mercurial-scm.org/D6408
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 17 May 2019 11:32:48 -0700
parents a66965406528
children 90b9a7e06c2c
line wrap: on
line diff