diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-07-13 16:52:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-13 16:52:51 -0700 |
| commit | 308528a3eae30b7dc02fffe76b91af8a91cc1b01 (patch) | |
| tree | 134e5590ed72e5b202d80849fb0d39d5f5c14455 /contrib | |
| parent | Merge branch 'mr/cmake' (diff) | |
| parent | ll_union_merge(): rename path_unused parameter (diff) | |
| download | tgif-308528a3eae30b7dc02fffe76b91af8a91cc1b01.tar.xz | |
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
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions