view tests/test-ui-color.py.out @ 21537:1ab30e9ba0fc

update: specify custom conflict markers for update (BC) Add custom conflict markers 'working copy' and 'destination' for doing hg update when there are conflicts between your working copy and the destination.
author Durham Goode <durham@fb.com>
date Fri, 09 May 2014 18:09:11 -0700
parents 842a9179132c
children b8c2004a8d2b
line wrap: on
line source

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