Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4741:87a35bb58b88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial.spec: fix when default python prefix != rpm %{_prefix} e.g. on SUSE Linux Enterprise 10
author Adam Spiers <hg@adamspiers.org>
date Sat, 02 Jun 2007 12:42:47 +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