diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:33 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-22 00:47:30 +0300 |
| commit | a37eec6333db6f38edd21e74812d6c5f215b6e6c (patch) | |
| tree | 6089be4d5a751e62fdbeb9642f3e67f721d622f1 /Makefile | |
| parent | 3d4fd9436337d1688e7e2c2b2da4f7b7e3e8591e (diff) | |
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-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |