diff tests/test-pull-pull-corruption2.out @ 3320:b16456909a0a

merge: various tidying update tests to handle corrected output and new workingctx display
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 02:15:20 -0500
parents 57729c56a23c
children
line wrap: on
line diff