view tests/test-ui-color.py.out @ 17885:9a2cf955db84 stable

filemerge: use util.shellquote when calling merge (issue3581)
author Keegan Carruthers-Smith <keegancsmith@fb.com>
date Fri, 26 Oct 2012 12:02:58 -0700
parents 842a9179132c
children b8c2004a8d2b
line wrap: on
line source

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