diff tests/test-merge-local.out @ 6590:9f80e062d71c

status: rename type_ to state
author Matt Mackall <mpm@selenic.com>
date Mon, 12 May 2008 11:37:08 -0500
parents 92ccccb55ba3
children a964ab624385
line wrap: on
line diff