Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 3821:2631b506e93d
Fixed indentation, spacing and a typo (debugdata->debugdate) in commands.table.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 07 Dec 2006 11:22:17 +0100 |
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