Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-changelog-exec.out @ 5245:0d28d4e5fe1f
Merge with crew-stable.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 27 Aug 2007 14:55:33 -0300 |
parents | 466323968b23 |
children |
comparison
equal
deleted
inserted
replaced
5241:5517aa5aafb0 | 5245:0d28d4e5fe1f |
---|---|
1 % manifest of p2: | |
2 bar | |
3 foo | |
4 | |
5 % manifest of p1: | |
6 foo | |
7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
8 (branch merge, don't forget to commit) | |
9 % this should not mention bar: | |
10 changeset: 3:ef2fc9b4a51b | |
11 tag: tip | |
12 parent: 2:ed1b79f46b9a | |
13 parent: 1:d394a8db219b | |
14 user: test | |
15 date: Thu Jan 01 00:00:00 1970 +0000 | |
16 description: | |
17 merge | |
18 | |
19 | |
20 rev offset length base linkrev nodeid p1 p2 | |
21 0 0 5 0 1 b004912a8510 000000000000 000000000000 |