Mercurial > hg
comparison tests/test-merge1.out @ 8387:50b6af595e0c
merge: add -S/--show option to review revisions without merging
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Thu, 14 May 2009 16:03:17 +0200 |
parents | 4b0c9c674707 |
children | 3682a19bb637 |
comparison
equal
deleted
inserted
replaced
8386:4aad982111b6 | 8387:50b6af595e0c |
---|---|
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 | |
10 user: test | |
11 date: Mon Jan 12 13:46:40 1970 +0000 | |
12 summary: commit #1 | |
13 | |
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5 (branch merge, don't forget to commit) | 15 (branch merge, don't forget to commit) |
6 diff -r d9e5953b9dec b | 16 diff -r d9e5953b9dec b |
7 --- /dev/null | 17 --- /dev/null |
8 +++ b/b | 18 +++ b/b |