From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Sep 2024 21:22:53 +0000 (-0700)
Subject: Merge branch 'ah/apply-3way-ours'
X-Git-Tag: v2.47.0-rc0~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e2a18cb049e35e4a13847c4b720c9d5f1dce5b9;p=thirdparty%2Fgit.git

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
---

6e2a18cb049e35e4a13847c4b720c9d5f1dce5b9