Merge branch 'dg/subtree-test-cleanup'
commit30fe9b2f9aece7f8f24bc069b9d7470b8291535e
authorJeff King <peff@peff.net>
Tue, 1 Dec 2015 23:54:31 +0000 (1 18:54 -0500)
committerJeff King <peff@peff.net>
Tue, 1 Dec 2015 23:54:31 +0000 (1 18:54 -0500)
treefa94365b9293f3fd8b4f37f42c086b7a0daae470
parent23bc35f3dc8b4241a9a6aa97db2a94d3c4c92468
parentd16031caf106dda2da52f10ef809cf4bfc83f7be
Merge branch 'dg/subtree-test-cleanup'

Test cleanups for the subtree project.

* dg/subtree-test-cleanup:
  contrib/subtree: Handle '--prefix' argument with a slash appended
  contrib/subtree: Make each test self-contained
  contrib/subtree: Add split tests
  contrib/subtree: Add merge tests
  contrib/subtree: Add tests for subtree add
  contrib/subtree: Add test for missing subtree
  contrib/subtree: Clean and refactor test code