Mercurial > hg

diff tests/test-conflict.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 5a034646e472
children b2ae81a7df29
line wrap: on
line diff
--- a/tests/test-conflict.out	Mon Mar 13 12:22:55 2006 +0100
+++ b/tests/test-conflict.out	Mon Mar 13 13:05:41 2006 +0100
@@ -1,7 +1,7 @@
 merge: warning: conflicts during merge
 merging a
 merging a failed!
-32e80765d7fe+75234512624c+ tip
+e7fe8eb3e180+0d24b7662d3e+ tip
 something else
 =======
 something