Major updates to resolution code from runs.

[wizard.git] / wizard / deploy.py

diff --git a/wizard/deploy.py b/wizard/deploy.py
index 6197a9a990584e2e774659cbb4b8099d42488603..b4d21528310bc6bee43fdf2a2e733f7d5021463f 100644 (file)
--- a/wizard/deploy.py
+++ b/wizard/deploy.py
@@ -381,6 +381,14 @@ class Application(object):
         added to the index, but no commit is made.
         """
         return False
+    def prepareMerge(self, dir):
+        """
+        Takes a directory and performs various edits to files in
+        order to make a merge go more smoothly.  This is usually
+        used to fix botched line-endings.  If you add new files,
+        you have to 'git add' them; this is not necessary for edits.
+        """
+        pass
     def prepareConfig(self, deployment):
         """
         Takes a deployment and replaces any explicit instances