Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-empty-file.out @ 3506:9de0e64545a3
Test that we notice the empty files from the second parent during a merge
This didn't work with 0.9.1, but was fixed by 05257fd28591.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Wed, 25 Oct 2006 02:51:27 -0300 |
parents | |
children | 8feb33c2d153 |
comparison
equal
deleted
inserted
replaced
3505:0aef94f45ebf | 3506:9de0e64545a3 |
---|---|
1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
2 changeset: 2:62ec0e86d1e5 | |
3 tag: tip | |
4 parent: 0:567dde5e6e98 | |
5 user: test | |
6 date: Mon Jan 12 13:46:40 1970 +0000 | |
7 summary: add empty3 | |
8 | |
9 changeset: 1:41ab7b321727 | |
10 user: test | |
11 date: Mon Jan 12 13:46:40 1970 +0000 | |
12 summary: add empty2 | |
13 | |
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
15 (branch merge, don't forget to commit) | |
16 M empty2 | |
17 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1 | |
18 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2 | |
19 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3 |