summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-07-01 16:22:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-01 16:22:39 -0700
commit27158e463a1be339ce34c7ee5fb553acaa7e28de (patch)
treea4ba9d0f81716dcb30e69677e09ef79c0878441d /combine-diff.c
parentMerge branch 'jc/checkdiff' (diff)
parentAllow git-apply to recount the lines in a hunk (AKA recountdiff) (diff)
downloadtgif-27158e463a1be339ce34c7ee5fb553acaa7e28de.tar.xz
Merge branch 'js/apply-recount'
* js/apply-recount: Allow git-apply to recount the lines in a hunk (AKA recountdiff)
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions