Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-revert2.out @ 1933:7544700fd931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 13 Mar 2006 13:05:41 +0100
parents 3b1b44b917f4
children d436b21b20dc
line wrap: on
line diff
--- a/tests/test-merge-revert2.out
+++ b/tests/test-merge-revert2.out
@@ -1,14 +1,14 @@
-1:f4d7a8c73d23
-0:232e179b3f29
-f4d7a8c73d23 tip
-232e179b3f29
-232e179b3f29+
-232e179b3f29
-f4d7a8c73d23 tip
+1:f248da0d4c3e
+0:9eca13a34789
+f248da0d4c3e tip
+9eca13a34789
+9eca13a34789+
+9eca13a34789
+f248da0d4c3e tip
 merge: warning: conflicts during merge
 merging file1
 merging file1 failed!
-diff -r f4d7a8c73d23 file1
+diff -r f248da0d4c3e file1
 --- a/file1
 +++ b/file1
 @@ -1,3 +1,7 @@ added file1
@@ -20,7 +20,7 @@ diff -r f4d7a8c73d23 file1
  changed file1
 +>>>>>>>
 M file1
-f4d7a8c73d23+ tip
-f4d7a8c73d23 tip
-f4d7a8c73d23 tip
-f4d7a8c73d23 tip
+f248da0d4c3e+ tip
+f248da0d4c3e tip
+f248da0d4c3e tip
+f248da0d4c3e tip