tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Tue, 18 Dec 2007 15:40:46 -0600
changeset 5666 9d6ad26fab10
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
fix spelling error

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