Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-filebranch.out @ 2178:00205fe76993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 02 May 2006 14:38:32 -0700
parents b2ae81a7df29
children fb493241d7f6
line wrap: on
line diff
--- a/tests/test-filebranch.out
+++ b/tests/test-filebranch.out
@@ -1,4 +1,5 @@
 creating base
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 creating branch a
 creating branch b
 we shouldn't have anything but n state here