comparison tests/test-merge-local.out @ 7214:0e8a9530d323

run-tests: --interactive overrides -j
author Matt Mackall <mpm@selenic.com>
date Wed, 22 Oct 2008 17:34:37 -0500
parents 92ccccb55ba3
children a964ab624385
comparison
equal deleted inserted replaced
7213:b4c035057d34 7214:0e8a9530d323