Mercurial > hg

diff tests/test-merge-default.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 1fe6f365df2e
children d8143769e1d4
line wrap: on
line diff
--- a/tests/test-merge-default.out	Thu May 14 15:48:47 2009 +0200
+++ b/tests/test-merge-default.out	Thu May 14 16:03:17 2009 +0200
@@ -13,6 +13,17 @@
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % should succeed - 2 heads
+changeset:   1:ba677d0156c1
+user:        test
+date:        Thu Jan 01 00:00:00 1970 +0000
+summary:     b
+
+changeset:   3:903c264cdf57
+parent:      1:ba677d0156c1
+user:        test
+date:        Thu Jan 01 00:00:00 1970 +0000
+summary:     d
+
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % should fail because at tip