view tests/test-ui-color.py.out @ 26605:ef21a2c41629

filemerge: add a wrapper around the filemerge function We'll introduce a separate premerge function that calls the same code.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 12:31:08 -0700
parents 842a9179132c
children b8c2004a8d2b
line wrap: on
line source

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