tests/test-ui-color.py.out
author Siddharth Agarwal <sid0@fb.com>
Sun, 11 Oct 2015 12:56:21 -0700
changeset 26606 2a405d307f8c
parent 14516 842a9179132c
child 37925 b8c2004a8d2b
permissions -rw-r--r--
filemerge: also return whether the merge is complete In future patches, we'll pause merges after the premerge step. After the premerge step we'll return complete = False.

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