Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
2177:6886bc0b77af 2178:00205fe76993
1 creating base 1 creating base
2 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 creating branch a 3 creating branch a
3 creating branch b 4 creating branch b
4 we shouldn't have anything but n state here 5 we shouldn't have anything but n state here
5 n 644 2 bar 6 n 644 2 bar
6 n 644 3 baz 7 n 644 3 baz