Merge branch 'rs/mergesort'

Make our mergesort implementation type-safe.

* rs/mergesort:
  mergesort: remove llist_mergesort()
  packfile: use DEFINE_LIST_SORT
  fetch-pack: use DEFINE_LIST_SORT
  commit: use DEFINE_LIST_SORT
  blame: use DEFINE_LIST_SORT
  test-mergesort: use DEFINE_LIST_SORT
  test-mergesort: use DEFINE_LIST_SORT_DEBUG
  mergesort: add macros for typed sort of linked lists
  mergesort: tighten merge loop
  mergesort: unify ranks loops

diff --cc Makefile
Simple merge

diff --cc blame.c
Simple merge

diff --cc commit.c
Simple merge

diff --cc fetch-pack.c
Simple merge

diff --cc packfile.c
Simple merge

diff --cc remote.c
Simple merge

diff --cc remote.h
Simple merge