tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 26 Mar 2007 23:50:03 -0300
changeset 4290 347766c2ff86
parent 3592 fffc8a733bf9
permissions -rw-r--r--
test-static-http: use printenv.py

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