tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 16 Feb 2007 04:54:46 -0200
changeset 4092 4ced663bebf0
parent 3592 fffc8a733bf9
permissions -rw-r--r--
git patches: handle renames of binary 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