Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/tests/test-merge1.out Thu Aug 27 11:55:21 2009 +0200 +++ b/tests/test-merge1.out Sat Sep 05 18:56:51 2009 +0200 @@ -1,11 +1,6 @@ 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