Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 4880:6403f948bd6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: extract correct status when script terminates with exit
author Patrick Mezard <pmezard@gmail.com>
date Sat, 14 Jul 2007 14:01:11 +0200
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)