Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3888:3b628b5da9e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use parent.__setattr__ instead of __dict__
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 14 Dec 2006 23:51: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