Update tripleo-heat-templates: mention merge tool

This section was written before that awful thing was created.

Change-Id: I63b6cff1715f60dc59cadfa4916d81f1a8df9a02