diff tests/test-http-proxy.t @ 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 d8e7b0781ad7
children 77d25b913f80
line wrap: on
line diff