Mercurial > hg

view tests/test-merge5.out @ 6105:6480af8fd53c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set bundle.mainreporoot only after checking that it's a local repo Fixes issue977.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 14 Feb 2008 18:08:16 -0200
parents fffc8a733bf9
children 4b0c9c674707
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