5 files changed, 48 insertions, 0 deletions
diff --git a/webapp/templates/mails/clean_merge.txt b/webapp/templates/mails/clean_merge.txt
new file mode 100644
index 0000000000..de8fdf67c1
--- /dev/null
+++ b/webapp/templates/mails/clean_merge.txt
@@ -0,0 +1,10 @@
+{%autoescape off%}
+Hi.
+
+Your change has been successfully merged into the git repository.
+
+For more details, see {%autoescape off%}{{url}}{%endautoescape%}
+
+-Your friendly git merger
+
+{%endautoescape%}
diff --git a/webapp/templates/mails/comment.txt b/webapp/templates/mails/comment.txt
new file mode 100644
index 0000000000..32f251afd4
--- /dev/null
+++ b/webapp/templates/mails/comment.txt
@@ -0,0 +1,7 @@
+{%autoescape off%}{%if message%}{{message|wordwrap:"72"}}
+
+{%endif%}{%if details%}{{details|wordwrap:"72"}}
+{%endif%}{%endautoescape%}
+--
+To respond, visit {%autoescape off%}{{url}}{%endautoescape%}
+
diff --git a/webapp/templates/mails/from_email_test.txt b/webapp/templates/mails/from_email_test.txt
new file mode 100644
index 0000000000..3a6891ddc3
--- /dev/null
+++ b/webapp/templates/mails/from_email_test.txt
@@ -0,0 +1,8 @@
+
+Test.
+
+If you received this email in error, we apologize.  Please reply-all and
+we'll make sure it doesn't happen again.
+
+
+
diff --git a/webapp/templates/mails/missing_dependency.txt b/webapp/templates/mails/missing_dependency.txt
new file mode 100644
index 0000000000..97f69e431a
--- /dev/null
+++ b/webapp/templates/mails/missing_dependency.txt
@@ -0,0 +1,13 @@
+{%autoescape off%}
+Hi.
+
+Your change could not be merged because of a missing dependency.  As
+soon as change XXX is submitted, your change will be submitted
+automatically.
+
+Your change: {%autoescape off%}{{url}}{%endautoescape%}
+The missing change: {%autoescape off%}{{url}}{%endautoescape%}
+
+-Your friendly git merger
+
+{%endautoescape%}
diff --git a/webapp/templates/mails/path_conflict.txt b/webapp/templates/mails/path_conflict.txt
new file mode 100644
index 0000000000..2ba59b9153
--- /dev/null
+++ b/webapp/templates/mails/path_conflict.txt
@@ -0,0 +1,10 @@
+{%autoescape off%}
+Hi.
+
+Your change has not been successfully merged into the git repository.
+
+You need to resolve the following files before it can be submitted:
+
+-Your friendly git merger
+
+{%endautoescape%}