summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-03-22 16:50:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-22 16:50:46 -0700
commit274b9cc25322d9ee79aa8e6d4e86f0ffe5ced925 (patch)
tree97bd391b7e49c10af962121644bac85c0d23ead7 /builtin/merge-ours.c
parentMerge branch 'en/rebase-backend' (diff)
downloadtgif-274b9cc25322d9ee79aa8e6d4e86f0ffe5ced925.tar.xz
Git 2.26
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions