comparison tests/test-import.t @ 1395:362e2c8c5677 stable

evolve: add a hint about how to abort an evolve with conflict The whole evolve --continue is hacky, but the way to abort it have been arcane knowledge, carried from sith lord to its apprentice for centuries. We add a hint to help the use discover it. One day a clean solution will come.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 19 Jun 2015 10:44:25 -0700
parents cc3e68120185
children 9f42f819267b
comparison
equal deleted inserted replaced
1394:e12082872afc 1395:362e2c8c5677