summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Sergey Organov <sorganov@gmail.com>2020-12-21 18:19:33 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-21 13:47:30 -0800
commita37eec6333db6f38edd21e74812d6c5f215b6e6c (patch)
tree6089be4d5a751e62fdbeb9642f3e67f721d622f1 /Makefile
parentrevision: provide implementation for diff merges tweaks (diff)
downloadtgif-a37eec6333db6f38edd21e74812d6c5f215b6e6c.tar.xz
revision: move diff merges functions to its own diff-merges.c
Create separate diff-merges.c and diff-merges.h files, and move all the code related to handling of diff merges there. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b84e182688..efcd63fe6e 100644
--- a/Makefile
+++ b/Makefile
@@ -872,6 +872,7 @@ LIB_OBJS += date.o
LIB_OBJS += decorate.o
LIB_OBJS += delta-islands.o
LIB_OBJS += diff-delta.o
+LIB_OBJS += diff-merges.o
LIB_OBJS += diff-lib.o
LIB_OBJS += diff-no-index.o
LIB_OBJS += diff.o