Mercurial > hg
diff tests/test-resolve.t @ 28641:4acd5651ffa2
summary: move mergemod before parents to give access to ms
author | timeless <timeless@mozdev.org> |
---|---|
date | Thu, 17 Mar 2016 14:50:29 +0000 |
parents | 7f77e71e5d7e |
children | 940c05b25b07 |
line wrap: on
line diff
--- a/tests/test-resolve.t Thu Mar 17 00:36:01 2016 +0000 +++ b/tests/test-resolve.t Thu Mar 17 14:50:29 2016 +0000 @@ -332,12 +332,12 @@ (see https://mercurial-scm.org/wiki/MergeStateRecords for more information) [255] $ hg summary + warning: merge state has unsupported record types: X parent: 2:57653b9f834a append baz to files parent: 1:dc77451844e3 append bar to files branch: default - warning: merge state has unsupported record types: X commit: 2 modified, 2 unknown (merge) update: 2 new changesets (update) phases: 5 draft