Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge8.out @ 3389:efbe24c7d8d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates) (Test case created by Johannes Hofmann)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 14 Oct 2006 10:53:29 +0200
parents
children 9103dab96093
comparison
equal deleted inserted replaced
3388:5eecae4ff722 3389:efbe24c7d8d9
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 pulling from ../a
3 searching for changes
4 adding changesets
5 adding manifests
6 adding file changes
7 added 2 changesets with 2 changes to 1 files
8 (run 'hg update' to get a working copy)
9 merging a and b
10 0 files updated, 1 files merged, 0 files removed, 0 files unresolved