diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-16 14:22:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-16 14:22:54 -0700 |
| commit | 6e2a18cb049e35e4a13847c4b720c9d5f1dce5b9 (patch) | |
| tree | 9dc645e657a95dbd805e5869a0b99a27ff357399 /diff.c | |
| parent | c1f41bbe1a23aabdf9026c735dac58c181487e94 (diff) | |
| parent | 57f583c748fdc65c16d1c24a7060a758850cb4a2 (diff) | |
Merge branch 'ah/apply-3way-ours'
"git apply --3way" learned to take "--ours" and other options.
* ah/apply-3way-ours:
apply: support --ours, --theirs, and --union for three-way merges
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions