diff tests/test-merge-local.out @ 6594:fca1688f0459

resolve: use cmdutil.match
author Matt Mackall <mpm@selenic.com>
date Mon, 12 May 2008 11:37:08 -0500
parents 92ccccb55ba3
children a964ab624385
line wrap: on
line diff