summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-09-16 07:43:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-16 07:43:41 -0700
commit02567e88ee8bdbf4d3852c2d6b9e5ce64a55a9e6 (patch)
treec96e392d4e3c80a55dd3e159bb58b2e9b355e8c5 /git-merge-octopus.sh
parentGit 1.7.3 rc2 (diff)
parentt7003: Use test_commit instead of custom function (diff)
downloadtgif-02567e88ee8bdbf4d3852c2d6b9e5ce64a55a9e6.tar.xz
Merge branch 'bg/fix-t7003'
* bg/fix-t7003: t7003: Use test_commit instead of custom function
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions