diff tests/test-stabilize-conflict.t @ 4595:3a3be1378634

evolve: increment progress *after* a whole merge commit is done The "re-stabilize" step was using the progress that was supposed to be for the next revision.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 19 Apr 2019 10:03:39 -0700
parents 96ce1030d2fb
children 79bc0f1a832e b6c819facbe8
line wrap: on
line diff