summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-30 13:29:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-30 13:29:31 -0700
commit8c7f78823888306c1cceafcf5fd26739eef99ce3 (patch)
treea65bf8c551cfa0f4e2d872e4901313b352ac0f3c /builtin-merge-ours.c
parentMerge branch 'maint-1.6.1' into maint (diff)
downloadtgif-8c7f78823888306c1cceafcf5fd26739eef99ce3.tar.xz
Update draft release notes to 1.6.2.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions