view tests/test-ui-color.py.out @ 13874:9d67277c9204

merge: add ancestor to the update function This makes it easier to do rebase-like operations.
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Apr 2011 15:25:20 -0500
parents 386e56ecfb78
children 842a9179132c
line wrap: on
line source

warning
error
'buffered\n'