X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=README.md;h=97cc384e56d467a32c1b865bdf948ef9dbbbd788;hb=b8b5ca12be0de95ee2e52994f705f06722071f18;hp=20135527b461041dd88a7da0e88a64bf9b886994;hpb=a6889c1cd3d7776e5533bde5d187ce27a0d1af92;p=apex-tripleo-heat-templates.git

diff --git a/README.md b/README.md
index 20135527..97cc384e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,10 @@
 templates
 =========
 
-Generic templates to describe multi-host infrastructure, consumable by OpenStack Heat, Crowbar, others.
\ No newline at end of file
+Generic templates to describe multi-host infrastructure, consumable by OpenStack Heat, Crowbar, others.
+
+
+merge.py
+========
+
+The Makefile contains several targets for generated templates, see its contents for all of them. To run functional tests for merge.py, run 'make test'.