Junio C Hamano a1f95951ef Merge branch 'en/merge-ort-api-null-impl' ...

Preparation for a new merge strategy.

* en/merge-ort-api-null-impl:
  merge,rebase,revert: select ort or recursive by config or environment
  fast-rebase: demonstrate merge-ort's API via new test-tool command
  merge-ort-wrappers: new convience wrappers to mimic the old merge API
  merge-ort: barebones API of new merge strategy with empty implementation

2020-11-18 13:32:53 -08:00

..

.gitignore

…

test-advise.c

…

test-bloom.c

…

test-chmtime.c

…

test-config.c

…

test-crontab.c

…

test-ctype.c

…

test-date.c

…

test-delta.c

…

test-dir-iterator.c

…

test-drop-caches.c

…

test-dump-cache-tree.c

…

test-dump-fsmonitor.c

…

test-dump-split-index.c

…

test-dump-untracked-cache.c

…

test-example-decorate.c

…

test-fake-ssh.c

…

test-fast-rebase.c

…

test-genrandom.c

…

test-genzeros.c

…

test-hash-speed.c

…

test-hash.c

…

test-hashmap.c

…

test-index-version.c

…

test-json-writer.c

…

test-lazy-init-name-hash.c

…

test-match-trees.c

…

test-mergesort.c

…

test-mktemp.c

…

test-oid-array.c

…

test-oidmap.c

…

test-online-cpus.c

…

test-parse-options.c

…

test-parse-pathspec-file.c

…

test-path-utils.c

…

test-pkt-line.c

…

test-prio-queue.c

…

test-proc-receive.c

…

test-progress.c

…

test-reach.c

…

test-read-cache.c

…

test-read-graph.c

…

test-read-midx.c

…

test-ref-store.c

…

test-regex.c

…

test-repository.c

…

test-revision-walking.c

…

test-run-command.c

…

test-scrap-cache-tree.c

…

test-serve-v2.c

…

test-sha1.c

…

test-sha1.sh

…

test-sha256.c

…

test-sigchain.c

…

test-strcmp-offset.c

…

test-string-list.c

…

test-submodule-config.c

…

test-submodule-nested-repo-config.c

…

test-subprocess.c

…

test-tool.c

…

test-tool.h

…

test-trace2.c

…

test-urlmatch-normalization.c

…

test-wildmatch.c

…

test-windows-named-pipe.c

…

test-write-cache.c

…

test-xml-encode.c

…