Junio C Hamano 18b26b18c5 Merge branch 'jk/no-diff-emit-common' ... "git merge-tree" used to mishandle "both sides added" conflict with its own "create a fake ancestor file that has the common parts of what both sides have added and do a 3-way merge" logic; this has been updated to use the usual "3-way merge with an empty blob as the fake common ancestor file" approach used in the rest of the system. * jk/no-diff-emit-common: xdiff: drop XDL_EMIT_COMMON merge-tree: drop generate_common strategy merge-one-file: use empty blob for add/add base		2016-02-26 13:37:14 -08:00
..
xdiff.h	xdiff: drop XDL_EMIT_COMMON	2016-02-22 22:36:09 -08:00
xdiffi.c	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00
xdiffi.h	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00
xemit.c	xdiff: drop XDL_EMIT_COMMON	2016-02-22 22:36:09 -08:00
xemit.h	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00
xhistogram.c	Correct common spelling mistakes in comments and tests	2013-04-12 13:38:40 -07:00
xinclude.h
xmacros.h	xdiff: cast arguments for ctype functions to unsigned char	2010-10-06 10:46:45 -07:00
xmerge.c	merge-file: ensure that conflict sections match eol style	2016-01-27 10:21:53 -08:00
xpatience.c	xdiff: PATIENCE/HISTOGRAM are not independent option bits	2012-02-19 15:36:55 -08:00
xprepare.c	xdiff: PATIENCE/HISTOGRAM are not independent option bits	2012-02-19 15:36:55 -08:00
xprepare.h
xtypes.h
xutils.c	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00
xutils.h	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00