Merge branch 'bg/xcalloc-nmemb-then-size' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:25:17 +0000 (10:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:25:17 +0000 (10:25 -0700)
* bg/xcalloc-nmemb-then-size:
transport-helper.c: rearrange xcalloc arguments
remote.c: rearrange xcalloc arguments
reflog-walk.c: rearrange xcalloc arguments
pack-revindex.c: rearrange xcalloc arguments
notes.c: rearrange xcalloc arguments
imap-send.c: rearrange xcalloc arguments
http-push.c: rearrange xcalloc arguments
diff.c: rearrange xcalloc arguments
config.c: rearrange xcalloc arguments
commit.c: rearrange xcalloc arguments
builtin/remote.c: rearrange xcalloc arguments
builtin/ls-remote.c: rearrange xcalloc arguments

1  2 
builtin/remote.c
commit.c
config.c
diff.c
Simple merge
diff --cc commit.c
Simple merge
diff --cc config.c
Simple merge
diff --cc diff.c
Simple merge