summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-04-22 22:29:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-04-22 22:29:13 -0700
commit4fd8145c0cb419a8b262115be8db9e18d63632db (patch)
treec8db062380d58cce0972f3e3dcd3f55538cd396c /builtin-merge-file.c
parentMerge branch 'da/maint-python-startup' into maint (diff)
parentdiff: use large integers for diffstat calculations (diff)
downloadtgif-4fd8145c0cb419a8b262115be8db9e18d63632db.tar.xz
Merge branch 'jk/maint-diffstat-overflow' into maint
* jk/maint-diffstat-overflow: diff: use large integers for diffstat calculations
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions