diff tests/test-histedit-fold.t @ 33883:e5d104c35e51

morestatus: check whether the conflict message is None before printing There are cases like bisect when the conflict message can be None. So we make sure that we don't print None in that case. Thanks to Martin for catching this. Differential Revision: https://phab.mercurial-scm.org/D461
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 21 Aug 2017 16:43:37 +0530
parents 96f43981c1c4
children 4441705b7111
line wrap: on
line diff