mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
1b244c77c7
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.
9 lines
135 B
Plaintext
9 lines
135 B
Plaintext
merge: warning: conflicts during merge
|
|
merging a
|
|
merging a failed!
|
|
e7fe8eb3e180+0d24b7662d3e+ tip
|
|
something else
|
|
=======
|
|
something
|
|
M a
|