Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5416:ca890c0c3f1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
osutil.c: style fix - delete trailing end-of-line spaces
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Sun, 07 Oct 2007 21:56:36 +0300
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