Mercurial > hg

view tests/test-merge5.out @ 5800:2f597243e1d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make run-tests.py --interactive work on Windows
author Patrick Mezard <pmezard@gmail.com>
date Sat, 05 Jan 2008 17:55:16 +0100
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