diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-24 00:36:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-18 00:46:13 -0800 |
| commit | 525ab63950e324823dd45423104cdcf5e46e2610 (patch) | |
| tree | 4ab4dcee4a942ad6b0877bfc1f508d34932a339a /Makefile | |
| parent | 3d51e1b5b84bde24f9a19e3cee603f0b57f62001 (diff) | |
| download | git-525ab63950e324823dd45423104cdcf5e46e2610.tar.gz git-525ab63950e324823dd45423104cdcf5e46e2610.tar.xz | |
merge-recursive: split low-level merge functions out.
This moves low-level merge functions out of merge-recursive.c and
places them in a new separate file, ll-merge.c
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -301,7 +301,7 @@ LIB_H = \ run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \ tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \ utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h \ - mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h + mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h ll-merge.h DIFF_OBJS = \ diff.o diff-lib.o diffcore-break.o diffcore-order.o \ @@ -324,7 +324,7 @@ LIB_OBJS = \ alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \ color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \ convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o \ - transport.o bundle.o walker.o parse-options.o ws.o archive.o + transport.o bundle.o walker.o parse-options.o ws.o archive.o ll-merge.o BUILTIN_OBJS = \ builtin-add.o \ |