diff tests/test-merge-force.out @ 6350:6aa4a3fa4e60

update: no -C needed to switch branches without outstanding changes
author Matt Mackall <mpm@selenic.com>
date Sat, 22 Mar 2008 13:30:08 -0500
parents 4b0c9c674707
children 3682a19bb637
line wrap: on
line diff