From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Jul 2021 23:52:51 +0000 (-0700)
Subject: Merge branch 'jk/union-merge-binary'
X-Git-Tag: v2.33.0-rc0~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=308528a3eae30b7dc02fffe76b91af8a91cc1b01;p=thirdparty%2Fgit.git

Merge branch 'jk/union-merge-binary'

The "union" conflict resolution variant misbehaved when used with
binary merge driver.

* jk/union-merge-binary:
  ll_union_merge(): rename path_unused parameter
  ll_union_merge(): pass name labels to ll_xdl_merge()
  ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION
---

308528a3eae30b7dc02fffe76b91af8a91cc1b01