]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 48d23c1 fa6ca11)
Merge branch 'nd/qsort-in-merge-recursive' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:03 +0000 (15:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:03 +0000 (15:19 -0800)
commit1df2046d270011837c904d2b568b599bf61cdb87
tree58103c57c22f3012bb7cec3b14e94573780c3b8atree | snapshot
parent48d23c12e7329213e0dfd73bbffc6ad05efcaf9dcommit | diff
parentfa6ca11105ccb46b785fd4ed58c333d5ad7f1774commit | diff
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 diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.