]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3c0b71 382b601)
Merge branch 'jk/union-merge-binary'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jul 2021 23:52:51 +0000 (16:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jul 2021 23:52:51 +0000 (16:52 -0700)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.