Mercurial > hg
diff tests/test-push-checkheads-unpushed-D5.t @ 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 | 9261f6c1d39b |
children | 5996640fc6fe |