summaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-01-12 23:31:46 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-12 23:31:46 -0800
commit5a6a9394814273e88124a5576c0be6d37a1262cc (patch)
treef1fdb053daf114e415b369b026fd566781d83050 /t/t3309-notes-merge-auto-resolve.sh
parentMerge branch 'maint-1.7.7' into maint (diff)
parentUpdate draft release notes to 1.7.7.6 (diff)
downloadtgif-5a6a9394814273e88124a5576c0be6d37a1262cc.tar.xz
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7: Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions