Mercurial > evolve

comparison tests/test-unstability-resolution-result.t @ 5244:4da1d21231ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b6c819facbe8
children baa0b481eec5
comparison
equal deleted inserted replaced
5243:5cfec61b872b 5244:4da1d21231ae
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 o | 6:1cf0aacfd363@default(public) bk:[] newer a 192 % | 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