comparison tests/test-simplemerge-cmd.out @ 7214:0e8a9530d323

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