diff --git a/tests/test-filebranch.out b/tests/test-filebranch.out --- a/tests/test-filebranch.out +++ b/tests/test-filebranch.out @@ -31,10 +31,10 @@ main: we should have a merge here 2 150 71 2 2 a6aef98656b7 c36078bec30d 000000000000 3 221 72 3 3 0c2cc6fc80e2 182b283965f1 a6aef98656b7 log should show foo and quux changed -changeset: 3:0c2cc6fc80e2d4ee289bb658dbbe9ad932380fe9 +changeset: 3:0c2cc6fc80e2 tag: tip -parent: 1:182b283965f1069c0112784e30e7755ad1c0dd52 -parent: 2:a6aef98656b71154cae9d87408abe6d0218c8045 +parent: 1:182b283965f1 +parent: 2:a6aef98656b7 user: test date: Mon Jan 12 13:46:40 1970 +0000 files: foo quux