diff tests/test-merge-local.out @ 8709:b9e0ddb04c5c

commit: move explicit file checking into repo.commit
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Jun 2009 21:51:00 -0500
parents 92ccccb55ba3
children a964ab624385
line wrap: on
line diff