annotate tests/test-ui-color.py.out @ 39285:a3fd84f4fb38

filemerge: fix the wrong placements of messages in prompt Mistakenly, the local-changed-other-deleted-message was put in other-change-local-deleted and vice versa. This followups on D4336. Thanks to Yuya who spotted this. Differential Revision: https://phab.mercurial-scm.org/D4375
author Pulkit Goyal <pulkit@yandex-team.ru>
date Sun, 26 Aug 2018 19:14:26 +0300
parents b8c2004a8d2b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11732
386e56ecfb78 color: call correct superclass method in write_err
Brodie Rao <brodie@bitheap.org>
parents:
diff changeset
1 warning
386e56ecfb78 color: call correct superclass method in write_err
Brodie Rao <brodie@bitheap.org>
parents:
diff changeset
2 error
37925
b8c2004a8d2b tests: port test-ui-color.py to Python 3
Augie Fackler <augie@google.com>
parents: 14516
diff changeset
3 b'buffered\n'
14516
842a9179132c color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents: 11732
diff changeset
4 colored? True
842a9179132c color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents: 11732
diff changeset
5 colored? True