diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-26 09:38:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-26 09:38:13 -0700 |
| commit | 2d5e9f31ac46017895ce6a183467037d29ceb9d3 (patch) | |
| tree | e69f8c07296df4fcb3b434dba38044b52ced1dcd /builtin/merge-ours.c | |
| parent | Merge branch 'ss/faq-ignore' (diff) | |
| download | tgif-2d5e9f31ac46017895ce6a183467037d29ceb9d3.tar.xz | |
Git 2.27-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions