view tests/test-merge5.out @ 4353:5e857d72d3ac

test-command-template: improve test coverage
author TK Soh <teekaysoh@yahoo.com>
date Tue, 10 Apr 2007 16:25:21 -0500
parents fffc8a733bf9
children 4b0c9c674707
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes