summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-11-17 13:45:22 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-11-17 13:45:22 -0800
commit6d40812e4b5d2128665351f4b427c7da7c7d86d5 (patch)
treef2c2fa0d1fd83856dda5d68afcab485e2d3ac387 /builtin/merge.c
parentMerge branch 'jk/create-branch-remove-unused-param' (diff)
parentdiffcore-delta: remove unused parameter to diffcore_count_changes() (diff)
downloadtgif-6d40812e4b5d2128665351f4b427c7da7c7d86d5.tar.xz
Merge branch 'tk/diffcore-delta-remove-unused'
Code cleanup. * tk/diffcore-delta-remove-unused: diffcore-delta: remove unused parameter to diffcore_count_changes()
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions