Mercurial > hg
diff contrib/editmerge @ 34001:3340efe80803
morestatus: simplify check for unresolved merge conflicts
Differential Revision: https://phab.mercurial-scm.org/D546
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 28 Aug 2017 14:47:18 -0700 |
parents | 612502900a2d |
children |