Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-dir-merge2.out @ 4311:4787e2b0dd03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix a bug where copies were ignored
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Apr 2007 16:43:18 -0500
parents c95060a5391a
children bb1800a7d7e1
comparison
equal deleted inserted replaced
4273:8185a1ca8628 4311:4787e2b0dd03
8 adding changesets 8 adding changesets
9 adding manifests 9 adding manifests
10 adding file changes 10 adding file changes
11 added 1 changesets with 1 changes to 1 files (+1 heads) 11 added 1 changesets with 1 changes to 1 files (+1 heads)
12 (run 'hg heads' to see heads, 'hg merge' to merge) 12 (run 'hg heads' to see heads, 'hg merge' to merge)
13 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 13 merging a/f and b/f
14 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
14 (branch merge, don't forget to commit) 15 (branch merge, don't forget to commit)
15 M b/f 16 M b/f
17 a/f
16 A b/aa/g 18 A b/aa/g
17 a/aa/g 19 a/aa/g
18 R a/aa/g 20 R a/aa/g
19 R a/f 21 R a/f