tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Sun, 17 Dec 2006 22:16:57 -0600
changeset 3929 33988aaa1652
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Add some modules to the demandimport ignore list for Windows

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