summaryrefslogtreecommitdiff
path: root/t/t3032-merge-recursive-options.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-09-11 22:35:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-09-11 22:35:11 -0700
commit2f9e2e75874e0f0722382106e2e189cc3f95cc7d (patch)
tree00b230dee1bc6002817ffc3366a9d6bc7d595599 /t/t3032-merge-recursive-options.sh
parentRelNotes/1.7.7: minor fixes (diff)
parentPrepare for 1.7.6.3 maintenance release (diff)
downloadtgif-2f9e2e75874e0f0722382106e2e189cc3f95cc7d.tar.xz
Merge branch 'maint'
* maint: Prepare for 1.7.6.3 maintenance release SubmittingPathces: remove Cogito reference Conflicts: RelNotes
Diffstat (limited to 't/t3032-merge-recursive-options.sh')
0 files changed, 0 insertions, 0 deletions