tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Fri, 08 Dec 2006 20:44:58 -0600
changeset 3837 7df171ea50cd
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Fix log regression where log -p file showed diffs for other files

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