Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4085:719488a98ebe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix hg showconfig traceback with values that aren't strings
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 15 Feb 2007 10:15:08 -0200
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