aboutsummaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 16:12:13 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-26 16:12:13 -0700
commit8371e91463d8d9507244952f1652f2c1e0779a84 (patch)
tree46eaf0160d00528e42c8ffdd3ea8bec0a3821d12 /git-merge-octopus.sh
parent1f7a2abcc18ec1080905dc5cd59381f7ac1c8111 (diff)
parente29bee19012d6aa4fb02dae727caa53947d9e39a (diff)
downloadgit-8371e91463d8d9507244952f1652f2c1e0779a84.tar.gz
git-8371e91463d8d9507244952f1652f2c1e0779a84.tar.xz
Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6
* rj/maint-t9159-svn-rev-notation: t9159-*.sh: skip for mergeinfo test for svn <= 1.4
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions