summaryrefslogtreecommitdiff
path: root/sha256/block
diff options
context:
space:
mode:
authorLibravatar Sergey Organov <sorganov@gmail.com>2020-12-21 18:19:44 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-21 13:47:31 -0800
commitec315c66bb73e26542b7b3de8abaffa310c4380e (patch)
tree3045585222e75a1a5b65ef875fe23b581c88f6d3 /sha256/block
parentt4013: support test_expect_failure through ':failure' magic (diff)
downloadtgif-ec315c66bb73e26542b7b3de8abaffa310c4380e.tar.xz
t4013: add tests for -m failing to override -c/--cc
Logically, -m, -c, --cc specify 3 different formats for representing merge commits, yet -m doesn't in fact override -c or --cc, that makes no sense. Add 2 expected to fail tests that demonstrate the problem. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha256/block')
0 files changed, 0 insertions, 0 deletions