diff tests/test-stabilize-conflict.t @ 3673:9c12b6520a20

import: adapt to fd1dd79cff20 With the latest state of the code, the patch is passed to "import try one" as parsed.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 17 Apr 2018 18:30:56 +0200
parents d166b3dc5e8a
children d5adce52cef4 f6979d64b9fb
line wrap: on
line diff