Mercurial > hg > gitweb

comparison tests/test-merge8.out @ 3674:9103dab96093

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid unnecessary copy merges
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Nov 2006 11:34:19 -0600
parents efbe24c7d8d9
children 4787e2b0dd03
comparison
equal deleted inserted replaced
3673:eb0b4a2d70a9 3674:9103dab96093
4 adding changesets 4 adding changesets
5 adding manifests 5 adding manifests
6 adding file changes 6 adding file changes
7 added 2 changesets with 2 changes to 1 files 7 added 2 changesets with 2 changes to 1 files
8 (run 'hg update' to get a working copy) 8 (run 'hg update' to get a working copy)
9 merging a and b 9 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
10 0 files updated, 1 files merged, 0 files removed, 0 files unresolved