Mercurial > hg

diff contrib/memory.py @ 44395:382f4f09f0bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add tests of debugmergestate with unresolved/resolved path conflicts I'm about to change `hg debugmergestate` and it broke on these "pu" and "pr" records on my first attempt (D8113), so let's add test coverage. Differential Revision: https://phab.mercurial-scm.org/D8119
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 13 Feb 2020 21:55:38 -0800
parents 2372284d9457
children d4ba4d51f85f
line wrap: on
line diff