Mercurial > hg
comparison tests/test-merge1.out @ 9429:d8143769e1d4
merge: exclude common ancestor from --preview (issue1818)
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sat, 05 Sep 2009 18:56:51 +0200 |
| parents | 3682a19bb637 |
| children |
comparison
equal
deleted
inserted
replaced
| 9428:5d6659cfaa06 | 9429:d8143769e1d4 |
|---|---|
| 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 2 created new head | 2 created new head |
| 3 %% no merges expected | 3 %% no merges expected |
| 4 changeset: 0:98e00378acd0 | |
| 5 user: test | |
| 6 date: Mon Jan 12 13:46:40 1970 +0000 | |
| 7 summary: commit #0 | |
| 8 | |
| 9 changeset: 1:4ee19afe4659 | 4 changeset: 1:4ee19afe4659 |
| 10 user: test | 5 user: test |
| 11 date: Mon Jan 12 13:46:40 1970 +0000 | 6 date: Mon Jan 12 13:46:40 1970 +0000 |
| 12 summary: commit #1 | 7 summary: commit #1 |
| 13 | 8 |