summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-11-28 11:13:59 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-28 11:13:59 -0800
commit66abce05dd5b9da9c889034781dc3de38b6e231b (patch)
tree13c4a3af9742b0bd0aff0189c3c100d15c86c37a /builtin-merge-ours.c
parentMakefile: do not clean arm directory (diff)
downloadtgif-66abce05dd5b9da9c889034781dc3de38b6e231b.tar.xz
Update draft release notes to 1.6.6 before merging topics for -rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions