summaryrefslogtreecommitdiff
path: root/t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-05-19 16:45:35 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-19 16:45:35 +0900
commitfab4a8a39666793d407371f519e8b6d25d33fa84 (patch)
treeea8851107dda1a726b3eec91d347996ead1ab683 /t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side
parentMerge branch 'jk/get-oid-indexed-object-name' (diff)
parentdifftool --no-index: error out on --dir-diff (and don't crash) (diff)
downloadtgif-fab4a8a39666793d407371f519e8b6d25d33fa84.tar.xz
Merge branch 'js/difftool-no-index'
The "--dir-diff" mode of "git difftool" is not useful in "--no-index" mode; they are now explicitly marked as mutually incompatible. * js/difftool-no-index: difftool --no-index: error out on --dir-diff (and don't crash)
Diffstat (limited to 't/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side')
0 files changed, 0 insertions, 0 deletions