view tests/test-ui-color.py.out @ 18337:557c8522aec0

tests: better test coverage of merges of flags This makes existing problems with merges of symlinks and files more obvious and add test coverage for tricky merges without real common ancestors.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 01:05:12 +0100
parents 842a9179132c
children b8c2004a8d2b
line wrap: on
line source

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