view tests/test-merge5.out @ 3213:d7d53e3d9590

Add style support to hgwebdir
author Edouard Gomez <ed.gomez@free.fr>
date Thu, 21 Sep 2006 21:24:26 +0200
parents 49988d9f0758
children 41989e55fa37
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