aboutsummaryrefslogtreecommitdiffstats
path: root/t/t4013/diff.diff_initial..side
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-31 13:15:00 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-31 13:15:00 -0800
commitb7786bb4b09463641f3e39eca18aefc630ee4f38 (patch)
tree63238e141abb3839d670e50a39b8da7ceb1fe2f7 /t/t4013/diff.diff_initial..side
parentMerge branch 'rs/qsort-s' (diff)
parentdifftool: hack around -Wzero-length-format warning (diff)
downloadgit-b7786bb4b09463641f3e39eca18aefc630ee4f38.tar.gz
git-b7786bb4b09463641f3e39eca18aefc630ee4f38.zip
Merge branch 'js/difftool-builtin'
Rewrite a scripted porcelain "git difftool" in C. * js/difftool-builtin: difftool: hack around -Wzero-length-format warning difftool: retire the scripted version difftool: implement the functionality in the builtin difftool: add a skeleton for the upcoming builtin
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions