view tests/test-merge5.out @ 4339:26a2fa9433b8

hgweb: make PATH_INFO handling slightly more robust
author Matt Mackall <mpm@selenic.com>
date Thu, 12 Apr 2007 11:00:21 -0500
parents fffc8a733bf9
children
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