diff tests/test-merge1.out @ 4611:274c99fc629f

dirstate: simplify state()
author Matt Mackall <mpm@selenic.com>
date Mon, 18 Jun 2007 13:24:34 -0500
parents 3109f012c305
children
line wrap: on
line diff