Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3064:fbd3f9fd645d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgk.py: use mercurial.patch functions when possible
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 07 Sep 2006 14:13:01 +0200
parents 49988d9f0758
children 41989e55fa37
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