summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-05-07 12:35:33 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-05-07 12:47:42 +0900
commit2d677e5b1537692a4f875740a6e9853c24285f02 (patch)
treed5aa6e81085453c2bfc5a18be72bd870f00849ef /builtin/merge-ours.c
parentMerge branch 'll/clone-reject-shallow' (diff)
downloadtgif-2d677e5b1537692a4f875740a6e9853c24285f02.tar.xz
The fourteenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions