tests/test-ui-color.py.out
author Siddharth Agarwal <sid0@fb.com>
Tue, 24 Nov 2015 18:26:21 -0800
changeset 27135 cc9d49160adc
parent 14516 842a9179132c
child 37925 b8c2004a8d2b
permissions -rw-r--r--
debugmergestate: also recognize change/delete conflicts in the merge state We're going to use this for tests in upcoming patches.

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