summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-12-15 09:43:01 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-12-15 09:44:54 -0800
commit1aaf14975709c069a87c2673551296a6eb3f82c5 (patch)
treed79b8a51ce0d3655ec7cc26ef1cbf19b5e9cf5c7 /builtin/merge-ours.c
parentMerge branch 'dt/fsck-verify-pack-error' into maint (diff)
downloadtgif-1aaf14975709c069a87c2673551296a6eb3f82c5.tar.xz
Update draft release notes to 2.6.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions