Mercurial > hg
comparison tests/test-conflict.out @ 1933:7544700fd931
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 |
comparison
equal
deleted
inserted
replaced
1932:82995896d5af | 1933:7544700fd931 |
---|---|
1 merge: warning: conflicts during merge | 1 merge: warning: conflicts during merge |
2 merging a | 2 merging a |
3 merging a failed! | 3 merging a failed! |
4 32e80765d7fe+75234512624c+ tip | 4 e7fe8eb3e180+0d24b7662d3e+ tip |
5 something else | 5 something else |
6 ======= | 6 ======= |
7 something | 7 something |
8 M a | 8 M a |