summaryrefslogtreecommitdiff
path: root/t/t5515/refs.br-branches-default-merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-21 15:07:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-21 15:07:18 -0700
commit434a7764bab3b93eb2e1777ca86550e59f3e9300 (patch)
tree754d568009e4922aa89acba08a51798654404968 /t/t5515/refs.br-branches-default-merge
parentMerge branch 'nd/conditional-config-include' (diff)
parentsequencer: drop "warning:" when stopping for edit (diff)
downloadtgif-434a7764bab3b93eb2e1777ca86550e59f3e9300.tar.xz
Merge branch 'js/rebase-helper'
Recent update to "rebase -i" started showing a message that is not a warning with "warning:" prefix by mistake. This has been fixed. * js/rebase-helper: sequencer: drop "warning:" when stopping for edit
Diffstat (limited to 't/t5515/refs.br-branches-default-merge')
0 files changed, 0 insertions, 0 deletions