Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge1.out @ 8387:50b6af595e0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/tests/test-merge1.out	Thu May 14 15:48:47 2009 +0200
+++ b/tests/test-merge1.out	Thu May 14 16:03:17 2009 +0200
@@ -1,6 +1,16 @@
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 %% no merges expected
+changeset:   0:98e00378acd0
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     commit #0
+
+changeset:   1:4ee19afe4659
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     commit #1
+
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 diff -r d9e5953b9dec b