summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-09-03 12:37:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-09-03 12:37:01 -0700
commit3cbff011b0f7fd5b50983f01337a3204559e25b7 (patch)
treeb4413e7595e83ce84df442d97a7e65aa5558e0b1 /git-merge-octopus.sh
parentMerge branch 'pw/rebase-i-more-options' (diff)
parentt7401: add a NEEDSWORK (diff)
downloadtgif-3cbff011b0f7fd5b50983f01337a3204559e25b7.tar.xz
Merge branch 'ss/t7401-modernize'
Test clean-up. * ss/t7401-modernize: t7401: add a NEEDSWORK t7401: change indentation for enhanced readability t7401: change syntax of test_i18ncmp calls for clarity t7401: use 'short' instead of 'verify' and cut in rev-parse calls t7401: modernize style
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions