comparison mercurial/localrepo.py @ 26165:927c0d84e09f

rebase: fix warning about ignoring tool option on rebase continue (issue4698) Before this patch rebase --continue with specified --tool option outputs warnings "tool option will be ignored". It is false statement because in case of any merge conflicts it uses specified tool to resolve it. This patch makes this warning appears only when user specified --tool when running rebase --abort , in this case tool doesn't have any sense
author liscju <piotr.listkiewicz@gmail.com>
date Tue, 01 Sep 2015 21:37:51 +0200
parents 51a30cae2bff
children bc1f8a79b4e4
comparison
equal deleted inserted replaced
26164:e037fd28c8bb 26165:927c0d84e09f