summaryrefslogtreecommitdiff
path: root/morphlib/artifactresolver_tests.py
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-09-03 14:41:43 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-09-03 14:41:43 +0100
commit15e12781bf84663c31aeba846107d80df81e770a (patch)
tree4175fc2902a6db3eff76cf30b9c26d8f8601e641 /morphlib/artifactresolver_tests.py
parentd415901bc394c64752b54089427b7b0b5638ca2a (diff)
parentf9718b4dcc172763c1dd46bc805b6bde03ec3706 (diff)
downloadmorph-15e12781bf84663c31aeba846107d80df81e770a.tar.gz
Merge branch 'jannis/find-repos-using-git-config-option'
Conflicts: morphlib/plugins/branch_and_merge_plugin.py
Diffstat (limited to 'morphlib/artifactresolver_tests.py')
0 files changed, 0 insertions, 0 deletions