tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Sun, 19 Nov 2006 16:32:36 -0600
changeset 3684 975c2469c316
parent 3592 fffc8a733bf9
permissions -rw-r--r--
correct remote heads test in prepush

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