diff -r 71b77b61ed60 -r 511d6ae462f3 tests/test-obsolete-divergent.t --- a/tests/test-obsolete-divergent.t Sun Aug 06 11:40:53 2017 -0700 +++ b/tests/test-obsolete-divergent.t Wed Aug 02 11:32:25 2017 +0200 @@ -670,7 +670,7 @@ $ rm .hg/localtags $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py - $ hg log -G -T '{rev}:{node|short} {desc} {troubles}' -r 'sort(all(), topo)' + $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)' @ 5:1a2a9b5b0030 B2 content-divergent | | o 4:70d5a63ca112 B4 content-divergent