view tests/test-status-inprocess.py.out @ 42804:7b80ad5af239

merge: hint about using `hg resolve` for resolving conflicts This was suggested by one of our users at Google. Makes sense to me. Differential Revision: https://phab.mercurial-scm.org/D6755
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 21 Aug 2019 13:14:39 -0700
parents 07dbafd3a0e2
children
line wrap: on
line source

% creating repo
% add and commit
C test.py
% change
M test.py