From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Jan 2017 21:15:00 +0000 (-0800)
Subject: Merge branch 'js/difftool-builtin'
X-Git-Tag: v2.12.0-rc0~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7786bb4b09463641f3e39eca18aefc630ee4f38;p=thirdparty%2Fgit.git

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
---

b7786bb4b09463641f3e39eca18aefc630ee4f38