Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4746:6def53be19fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
buildrpm: fix rpm release number calculation It was broken when patch queues were in use.
author Adam Spiers <hg@adamspiers.org>
date Sat, 30 Jun 2007 01:21:41 +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