diff tests/test-simplemerge-cmd.out @ 11173:5b48d819d5f9

commit: note new branch heads rather than topological heads Move to using contexts while we're at it.
author Matt Mackall <mpm@selenic.com>
date Thu, 13 May 2010 17:24:21 -0500
parents e1f4343db740
children
line wrap: on
line diff