Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-rename-dir-merge2.out @ 4117:c95060a5391a
merge: fix renaming of subdirectories under renamed directories
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 27 Feb 2007 16:20:06 -0600 |
parents | |
children | 4787e2b0dd03 |
comparison
equal
deleted
inserted
replaced
4106:f5f171785e29 | 4117:c95060a5391a |
---|---|
1 adding a/f | |
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 copying a/f to b/f | |
4 removing a/f | |
5 adding a/aa/g | |
6 pulling from ../r2 | |
7 searching for changes | |
8 adding changesets | |
9 adding manifests | |
10 adding file changes | |
11 added 1 changesets with 1 changes to 1 files (+1 heads) | |
12 (run 'hg heads' to see heads, 'hg merge' to merge) | |
13 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
14 (branch merge, don't forget to commit) | |
15 M b/f | |
16 A b/aa/g | |
17 a/aa/g | |
18 R a/aa/g | |
19 R a/f |