Mercurial > hg
view tests/test-filelog.py.out @ 48516:59524cb1cd73
simplemerge: don't calculate conflict labels when resolving automatically
Differential Revision: https://phab.mercurial-scm.org/D11903
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 07 Dec 2021 23:01:20 -0800 |
parents | d76ba2090e0c |
children |
line wrap: on
line source
ERROR: FIXME: This is a known failure of filelog.size for data starting with \1\n OK.