summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-01-10 14:01:50 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-01-10 14:01:50 -0800
commit650b1037063d81a9cbcb23cc409eb27f652ae53d (patch)
tree46170ee74ecd99643b65d010b497aa0cc829d572 /builtin/merge-ours.c
parentMerge branch 'js/perl-path-workaround-in-tests' (diff)
downloadtgif-650b1037063d81a9cbcb23cc409eb27f652ae53d.tar.xz
RelNotes update before -rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions