diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-18 15:47:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-18 15:47:56 -0700 |
| commit | 0ef08090d2a391e0ce037eafd2b391e3f76b1060 (patch) | |
| tree | e88ee06ddb6a8e3d800c34f43b87e9a2348f36c9 /Documentation/git-mergetool--lib.txt | |
| parent | Thirteenth batch (diff) | |
| parent | test-mergesort: use repeatable random numbers (diff) | |
| download | tgif-0ef08090d2a391e0ce037eafd2b391e3f76b1060.tar.xz | |
Merge branch 'rs/mergesort'
The mergesort implementation used to sort linked list has been
optimized.
* rs/mergesort:
test-mergesort: use repeatable random numbers
mergesort: use ranks stack
p0071: test performance of llist_mergesort()
p0071: measure sorting of already sorted and reversed files
test-mergesort: add unriffle_skewed mode
test-mergesort: add unriffle mode
test-mergesort: add generate subcommand
test-mergesort: add test subcommand
test-mergesort: add sort subcommand
test-mergesort: use strbuf_getline()
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions