summaryrefslogtreecommitdiff
path: root/contrib/examples/git-difftool.perl
AgeCommit message (Collapse)AuthorFilesLines
2017-01-31Merge branch 'js/difftool-builtin'Libravatar Junio C Hamano1-0/+481
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
2017-01-19difftool: retire the scripted versionLibravatar Johannes Schindelin1-0/+470
It served its purpose, but now we have a builtin difftool. Time for the Perl script to enjoy Florida. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>