mirror of
https://github.com/git/git
synced 2024-10-12 11:32:34 +00:00
18b26b18c5
"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 |
||
|---|---|---|
| .. | ||
| xdiff.h | ||
| xdiffi.c | ||
| xdiffi.h | ||
| xemit.c | ||
| xemit.h | ||
| xhistogram.c | ||
| xinclude.h | ||
| xmacros.h | ||
| xmerge.c | ||
| xpatience.c | ||
| xprepare.c | ||
| xprepare.h | ||
| xtypes.h | ||
| xutils.c | ||
| xutils.h | ||