Mercurial > hg
comparison Makefile @ 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 | ec7b478f1bf8 |
children | 7521e6d18057 |
comparison
equal
deleted
inserted
replaced
42803:8ab1ae7f1cf4 | 42804:7b80ad5af239 |
---|