Mercurial > evolve
comparison tests/test-evolve-public-content-divergent-corner-cases.t @ 5244:4da1d21231ae
tests: update output to match 1b8fd4af3318 in core
CORE-TEST-OUTPUT-UPDATE: 1b8fd4af3318
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 15 Apr 2020 21:52:29 +0800 |
| parents | 900668a93629 |
| children | 417503ef667d |
comparison
equal
deleted
inserted
replaced
| 5243:5cfec61b872b | 5244:4da1d21231ae |
|---|---|
| 149 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | 149 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
| 150 | @@ -1,1 +1,2 @@ | 150 | @@ -1,1 +1,2 @@ |
| 151 | c | 151 | c |
| 152 | +cc | 152 | +cc |
| 153 | | 153 | |
| 154 o 4:c0d7ee6604ea added c | 154 % 4:c0d7ee6604ea added c |
| 155 | public | 155 | public |
| 156 | | 156 | |
| 157 | diff -r c9241b0f2d5b -r c0d7ee6604ea c | 157 | diff -r c9241b0f2d5b -r c0d7ee6604ea c |
| 158 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | 158 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| 159 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | 159 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |