view tests/test-ui-color.py.out @ 12664:545ec1775021

merge: handle no file parent in backwards merge (issue2364)
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Oct 2010 14:50:20 -0500
parents 386e56ecfb78
children 842a9179132c
line wrap: on
line source

warning
error
'buffered\n'