tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 27 Nov 2006 22:03:31 -0200
changeset 3716 ab5600428b08
parent 3592 fffc8a733bf9
permissions -rw-r--r--
handle files with both git binary patches and copy/rename ops

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