diff tests/test-simplemerge.py.out @ 38772:af5c0c933af8

fileset: use ctx1.status(ctx2) instead of repo.status(ctx1, ctx2) Differential Revision: https://phab.mercurial-scm.org/D3999
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 27 Jul 2018 14:48:06 -0700
parents f18830651811
children
line wrap: on
line diff