diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-12-05 11:24:17 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-12-05 11:24:28 -0800 |
commit | cd1c2e7301820f9a198c8d665cd72d930233d02a (patch) | |
tree | bae2ad03e1ca04c3168e2f4bc2db840b14bc043d /builtin/diff.c | |
parent | Merge branch 'tk/diffcore-delta-remove-unused' into maint (diff) | |
parent | common-main: stop munging argv[0] path (diff) | |
download | tgif-cd1c2e7301820f9a198c8d665cd72d930233d02a.tar.xz |
Merge branch 'jk/common-main' into maint-2.10
* jk/common-main:
common-main: stop munging argv[0] path
git-compat-util: move content inside ifdef/endif guards
Diffstat (limited to 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions