Merge branch 'nd/qsort-in-merge-recursive'
commit7e73488b46b317eea289373eed15086feb0cd959
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:48 +0000 (16 15:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:48 +0000 (16 15:27 -0800)
treee80f2f6daa77f11d537e266f988d52ddf95ff369
parent12cf1135df64ae2a94e6146f96fdb963d2ee152e
parentfa6ca11105ccb46b785fd4ed58c333d5ad7f1774
Merge branch 'nd/qsort-in-merge-recursive'

Code simplification.

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