projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4c634a4 382b601)
Merge branch 'jk/union-merge-binary' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2021 02:26:20 +0000 (11:26 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2021 02:26:20 +0000 (11:26 +0900)
commitcf9b0c4f1cb05f4c49240766b68856b3b57b2ee3
treefa359a83a31bf959a7e6f971104b2606064dcbc1tree | snapshot
parent4c634a4a8ffae654c3cc4e403aa31e7d660d7e6dcommit | diff
parent382b601acde12b298bb84faa11b3f42868716a0dcommit | diff
Merge branch 'jk/union-merge-binary' into jch

The "union" conflict resultion 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
Unnamed repository; edit this file 'description' to name the repository.