Mercurial > evolve
comparison tests/test-unstability-resolution-result.t @ 5541:98e2613d797d
branching: merge with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 17 Sep 2020 20:26:55 +0200 |
| parents | e48fd82923f1 452651e69848 |
| children | e5d91fd1f319 |
comparison
equal
deleted
inserted
replaced
| 5537:a609f73fc189 | 5541:98e2613d797d |
|---|---|
| 187 $ glog | 187 $ glog |
| 188 @ 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: | 188 @ 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
| 189 | | 189 | |
| 190 | o 7:7bc2f5967f5e@default(draft) bk:[] add c | 190 | o 7:7bc2f5967f5e@default(draft) bk:[] add c |
| 191 | | | 191 | | |
| 192 % | 6:1cf0aacfd363@default(public) bk:[] newer a | 192 o | 6:1cf0aacfd363@default(public) bk:[] newer a |
| 193 |/ | 193 |/ |
| 194 o 5:66719795a494@default(public) bk:[changea] changea | 194 o 5:66719795a494@default(public) bk:[changea] changea |
| 195 | | 195 | |
| 196 o 0:07f494440405@default(public) bk:[] adda | 196 o 0:07f494440405@default(public) bk:[] adda |
| 197 | 197 |