Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3225:2f35961854fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[extendedchangelog] add extra metadata in the changelog entry - add a third item in the date field that holds arbitrary key:value items
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 02 Oct 2006 22:35:52 +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