From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 23:19:03 +0000 (-0800)
Subject: Merge branch 'nd/qsort-in-merge-recursive' into maint
X-Git-Tag: v2.11.1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1df2046d270011837c904d2b568b599bf61cdb87;p=thirdparty%2Fgit.git

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
---

1df2046d270011837c904d2b568b599bf61cdb87