diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2024-09-09 08:10:58 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-09 10:07:24 -0700 |
| commit | 57f583c748fdc65c16d1c24a7060a758850cb4a2 (patch) | |
| tree | 1d30980a14e35a0d2710d03888d3e4e93dbd6f63 /diff.c | |
| parent | 4c42d5ff284067fa32837421408bebfef996bf81 (diff) | |
apply: support --ours, --theirs, and --union for three-way merges
--ours, --theirs, and --union are already supported in `git merge-file`
for automatically resolving conflicts in favor of one version or the
other, instead of leaving conflict markers in the file. Support them in
`git apply -3` as well because the two commands do the same kind of
file-level merges.
In case in the future --ours, --theirs, and --union gain a meaning
outside of three-way-merges, they do not imply --3way but rather must be
specified alongside it.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions