view tests/test-merge5.out @ 3223:53e843840349

Whitespace/Tab cleanup
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 01 Oct 2006 19:26:33 +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