view tests/test-merge5.out @ 4288:8a3e12426c03

test-push-http: use printenv.py
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 26 Mar 2007 23:50:00 -0300
parents fffc8a733bf9
children 4b0c9c674707
line wrap: on
line source

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