Mercurial > hg
view tests/test-extra-filelog-entry.t @ 48584:74973a6d4e67
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:13:12 -0800 |
parents | d4e62df1c73d |
children | ccd76e292be5 |
line wrap: on
line source
Issue351: mq: qrefresh can create extra revlog entry $ echo "[extensions]" >> $HGRCPATH $ echo "mq=" >> $HGRCPATH $ hg init $ hg qinit $ echo b > b $ hg ci -A -m foo adding b $ echo cc > b $ hg qnew -f foo.diff $ echo b > b $ hg qrefresh $ hg debugindex b rev linkrev nodeid p1 p2 0 0 1e88685f5dde 000000000000 000000000000