Mercurial > hg > gitweb

view tests/test-merge5.out @ 2990:61fcd9fac434

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc and add documentation for this.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 22 Aug 2006 10:08:42 +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