view tests/test-ui-color.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 b8c2004a8d2b
children
line wrap: on
line source

warning
error
b'buffered\n'
colored? True
colored? True