diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-31 21:15:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-31 21:15:00 (GMT) |
| commit | b7786bb4b09463641f3e39eca18aefc630ee4f38 (patch) | |
| tree | 63238e141abb3839d670e50a39b8da7ceb1fe2f7 /Makefile | |
| parent | 6ad8b8e98faa5a301a98a2997da162dea060672e (diff) | |
| parent | 94d3997ecc09f36d17b9ad4b49c4709885e300f7 (diff) | |
| download | git-b7786bb4b09463641f3e39eca18aefc630ee4f38.zip git-b7786bb4b09463641f3e39eca18aefc630ee4f38.tar.gz git-b7786bb4b09463641f3e39eca18aefc630ee4f38.tar.bz2 | |
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 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -525,7 +525,6 @@ SCRIPT_LIB += git-sh-setup SCRIPT_LIB += git-sh-i18n SCRIPT_PERL += git-add--interactive.perl -SCRIPT_PERL += git-difftool.perl SCRIPT_PERL += git-archimport.perl SCRIPT_PERL += git-cvsexportcommit.perl SCRIPT_PERL += git-cvsimport.perl @@ -886,6 +885,7 @@ BUILTIN_OBJS += builtin/diff-files.o BUILTIN_OBJS += builtin/diff-index.o BUILTIN_OBJS += builtin/diff-tree.o BUILTIN_OBJS += builtin/diff.o +BUILTIN_OBJS += builtin/difftool.o BUILTIN_OBJS += builtin/fast-export.o BUILTIN_OBJS += builtin/fetch-pack.o BUILTIN_OBJS += builtin/fetch.o |