# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1559867048 -7200
# Node ID 194adaeb84e8a8d7d63625b6174931504dc209a4
# Parent  b62ed7c69561be42357541d4aa217a1abd0ee7f2# Parent  df41605bd26c328e90c8cabe4962d5469a914f4e
branching: merge back with stable

diff -r b62ed7c69561 -r 194adaeb84e8 tests/test-evolve-progress.t