Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge1 @ 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 | e506c14382fd |
children | 49966b5ab16f |