2 Commits (833622a945a677ec690e5ffb05a637e425591f1d)

Author	SHA1	Message	Date
Junio C Hamano	b7786bb4b0	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	2017-01-31 13:15:00 -08:00
Johannes Schindelin	019678d6b1	difftool: retire the scripted version ... 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>	2017-01-19 13:23:43 -08:00