diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-06-29 05:06:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-29 05:24:45 (GMT) |
| commit | 0c7993839b92f466278439a724023f8be50391c1 (patch) | |
| tree | fd1fc5395f2dce9c742b0902c82fe60e4b9da718 /Makefile | |
| parent | 83788070a3dd0a4905dd76c865320c51f7d74a83 (diff) | |
| download | git-0c7993839b92f466278439a724023f8be50391c1.zip git-0c7993839b92f466278439a724023f8be50391c1.tar.gz git-0c7993839b92f466278439a724023f8be50391c1.tar.bz2 | |
Improved three-way blob merging code
This fleshes out the code that generates a three-way merge of a set of
blobs.
It still actually does the three-way merge using an external executable
(ie just calling "merge"), but the interfaces have been cleaned up a lot
and are now fully based on the 'mmfile_t' interface, so if libxdiff were
to ever grow a compatible three-way-merge, it could probably be directly
plugged in.
It also uses the previous XDL_EMIT_COMMON functionality extension to
libxdiff to generate a made-up base file for the merge for the case where
no base file previously existed. This should be equivalent to what we
currently do in git-merge-one-file.sh:
diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add
except it should be much simpler and can be done using the direct libxdiff
interfaces.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -217,7 +217,7 @@ LIB_OBJS = \ server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \ tag.o tree.o usage.o config.o environment.o ctype.o copy.o \ fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \ - alloc.o $(DIFF_OBJS) + alloc.o merge-file.o $(DIFF_OBJS) BUILTIN_OBJS = \ builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \ |