]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'nd/qsort-in-merge-recursive'
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:48 +0000 (15:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:48 +0000 (15:27 -0800)
Code simplification.

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

1  2 
merge-recursive.c

Simple merge