diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-10-28 01:24:23 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-10-28 01:24:23 +0300 |
commit | e7e5c6f715b2de7bea0d39c7d2ba887335b40aa0 (patch) | |
tree | 7e4543fd73f9eaf7962feda682f57ca32deabfc1 /merge-recursive.c | |
parent | 40d2f93bde0d7f256eea28ed940a8855432fa5d6 (diff) |
Downmerge a bit more for 2.38.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions