Merge branch 'tb/print-size-t-with-uintmax-format'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2018 07:24:41 +0000 (16:24 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2018 07:24:41 +0000 (16:24 +0900)
Code preparation to replace ulong vars with size_t vars where
appropriate.

* tb/print-size-t-with-uintmax-format:
  Upcast size_t variables to uintmax_t when printing

1  2 
builtin/cat-file.c
builtin/index-pack.c
builtin/pack-objects.c
diff.c
ref-filter.c
sha1-file.c

Simple merge
Simple merge
Simple merge
diff --cc diff.c
Simple merge
diff --cc ref-filter.c
Simple merge
diff --cc sha1-file.c
Simple merge