Mercurial > hg-stable
comparison tests/remotefilelog-library.sh @ 44377:8561ad49915d
revset: add a revset for parents in merge state
This may be particularly useful soon, when I'm going to change how `hg
rebase` sets its parents during conflict resolution.
Differential Revision: https://phab.mercurial-scm.org/D8041
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 29 Jan 2020 11:30:35 -0800 |
| parents | 17f21047a232 |
| children | 0826d684a1b5 |
comparison
equal
deleted
inserted
replaced
| 44376:7f7c8521e9bd | 44377:8561ad49915d |
|---|