tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 08 Jun 2007 23:49:12 -0300
changeset 4522 591322269fed
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Use absolute paths in addremove. This is more consistent with other places in the code, which only use the "relpath" returned by cmdutil.walk for display purposes.

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