Mercurial > evolve
comparison tests/test-evolve-public-content-divergent-corner-cases.t @ 5309:30a924abda75 mercurial-5.3
test-compat: back out changeset 4da1d21231ae
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 08 May 2020 19:22:36 +0800 |
| parents | e8660b28bfee |
| children | e6e92835d42d 98e2613d797d |
comparison
equal
deleted
inserted
replaced
| 5308:e656e9d01de4 | 5309:30a924abda75 |
|---|---|
| 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 % 4:c0d7ee6604ea added c | 154 o 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 |