summaryrefslogtreecommitdiff
path: root/without-test-modules
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-07-31 15:43:19 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-08-01 13:25:13 +0000
commit5e7133b8ff1f4d685e6cd0dda24c24e6764ac296 (patch)
tree7dd5d94f3fbeeb197560e404127b5ed56a0b7162 /without-test-modules
parent83b51359210baf09c977df91d545eddb570d6dfc (diff)
downloadmorph-5e7133b8ff1f4d685e6cd0dda24c24e6764ac296.tar.gz
Move init and minedir to branch_and_merge plugin
deduce_mine_directory is duplicated in the plugin and morphlib.app until all the commands are moved into the plugin.
Diffstat (limited to 'without-test-modules')
-rw-r--r--without-test-modules1
1 files changed, 1 insertions, 0 deletions
diff --git a/without-test-modules b/without-test-modules
index 4c3af81f..67a1e143 100644
--- a/without-test-modules
+++ b/without-test-modules
@@ -12,4 +12,5 @@ morphlib/plugins/tarball-systembuilder_plugin.py
morphlib/plugins/show_dependencies_plugin.py
morphlib/plugins/update_gits_plugin.py
morphlib/plugins/trebuchet_plugin.py
+morphlib/plugins/branch_and_merge_plugin.py