From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Dec 2016 23:27:48 +0000 (-0800)
Subject: Merge branch 'nd/qsort-in-merge-recursive'
X-Git-Tag: v2.12.0-rc0~154
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e73488b46b317eea289373eed15086feb0cd959;p=thirdparty%2Fgit.git

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

Code simplification.

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

7e73488b46b317eea289373eed15086feb0cd959