Mercurial > hg
annotate tests/test-ui-color.py.out @ 26519:48476c6129a2
filemerge: run symlink check for :merge3
Just like :merge, :merge3 doesn't support merging symlinks.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 07 Oct 2015 00:27:23 -0700 |
parents | 842a9179132c |
children | b8c2004a8d2b |
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 |
386e56ecfb78
color: call correct superclass method in write_err
Brodie Rao <brodie@bitheap.org>
parents:
diff
changeset
|
3 '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 |