Merge branch 'nd/qsort-in-merge-recursive' into maint
commit1df2046d270011837c904d2b568b599bf61cdb87
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:03 +0000 (17 15:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:03 +0000 (17 15:19 -0800)
tree58103c57c22f3012bb7cec3b14e94573780c3b8a
parent48d23c12e7329213e0dfd73bbffc6ad05efcaf9d
parentfa6ca11105ccb46b785fd4ed58c333d5ad7f1774
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
merge-recursive.c