Merge branch 'nd/qsort-in-merge-recursive' into maint

Code simplification. * nd/qsort-in-merge-recursive: merge-recursive.c: use string_list_sort instead of qsort

Junio C Hamano committed Jan 17, 2017 at 15:19 UTC 1df2046d270011837c904d2b568b599bf61cdb87

No changes.