view tests/test-merge5.out @ 4227:f5b9edf3390b

hgweb.unbundle: call req.httphdr only after the last possible call to bail
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 22 Oct 2006 13:54:43 -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