diff options
| author | Elijah Newren <newren@gmail.com> | 2020-10-27 02:08:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-27 05:36:14 (GMT) |
| commit | 47b1e890e3f7ba57e8c5bc364dcb04d8b2dc1c58 (patch) | |
| tree | cbd7a8765991045d59d0047367b1a23404460512 /Makefile | |
| parent | 17e5574b0446836af08136ae269b30767c05b1d7 (diff) | |
| download | git-47b1e890e3f7ba57e8c5bc364dcb04d8b2dc1c58.zip git-47b1e890e3f7ba57e8c5bc364dcb04d8b2dc1c58.tar.gz git-47b1e890e3f7ba57e8c5bc364dcb04d8b2dc1c58.tar.bz2 | |
merge-ort-wrappers: new convience wrappers to mimic the old merge API
There are a few differences between the new API in merge-ort and the old
API in merge-recursive. While the new API is more flexible, it might
feel like more work at times than the old API. merge-ort-wrappers
creates two convenience wrappers taking the exact same arguments as the
old merge_trees() and merge_recursive() functions and implements them
via the new API. This makes converting existing callsites easier, and
serves to highlight some of the differences in the API.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -922,6 +922,7 @@ LIB_OBJS += match-trees.o LIB_OBJS += mem-pool.o LIB_OBJS += merge-blobs.o LIB_OBJS += merge-ort.o +LIB_OBJS += merge-ort-wrappers.o LIB_OBJS += merge-recursive.o LIB_OBJS += merge.o LIB_OBJS += mergesort.o |