Mercurial > hg-stable

view tests/test-merge5.out @ 4170:7b5723c95a82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Save an absolute path in repo.path This should keep things working if the process changes directories after creating a repo object.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 10 Mar 2007 22:03:20 -0300
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