| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
| Sat, 10 Mar 2007 23:00:45 -0300 | |
| changeset 4185 | 51ee2868a571 |
| parent 3509 | 9de0e64545a3 |
| child 5405 | 8feb33c2d153 |
| permissions | -rw-r--r-- |
|
3509
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
changeset: 2:62ec0e86d1e5 |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
3 |
tag: tip |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
4 |
parent: 0:567dde5e6e98 |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 |
user: test |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
6 |
date: Mon Jan 12 13:46:40 1970 +0000 |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
7 |
summary: add empty3 |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
8 |
|
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
9 |
changeset: 1:41ab7b321727 |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
user: test |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 |
date: Mon Jan 12 13:46:40 1970 +0000 |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
12 |
summary: add empty2 |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
13 |
|
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
14 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
15 |
(branch merge, don't forget to commit) |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
16 |
M empty2 |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
17 |
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1 |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
18 |
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2 |
|
9de0e64545a3
Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
19 |
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3 |