Mercurial > hg

view tests/test-merge5.out @ 3148:adb246ce6736

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix newline in error message
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 22 Sep 2006 18:29:04 +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