From aa158a147dd976a0315e7ed755e44648b81cfc1b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 18 Feb 2013 18:52:47 -0400
Subject: [PATCH] blog for the day

---
 .../configurators/newrepository/combine.hamlet  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 templates/configurators/newrepository/combine.hamlet

diff --git a/templates/configurators/newrepository/combine.hamlet b/templates/configurators/newrepository/combine.hamlet
new file mode 100644
index 0000000000..3ea8034822
--- /dev/null
+++ b/templates/configurators/newrepository/combine.hamlet
@@ -0,0 +1,17 @@
+<div .span9 .hero-unit>
+  <h2>
+    Combine repositories?
+  <p>
+    You have created a new repository at #{newrepopath}. #
+    Do you want to combine it with your existing repository at #{mainrepopath}?
+  <p>
+    Combining the repositories will sync their files, so each will have #
+    added to it all files from the other repository.
+  <p>
+    If you want to use the new repository to hold different sorts of files, #
+    you should not combine the repositories.
+  <p>
+    <a .btn .btn-primary href="@{CombineRepository newrepopath}">
+      <i .icon-resize-small></i> Combine the repositories
+    <a .btn href="@{SwitchToRepositoryR newrepopath}">
+      <i .icon-resize-full></i> Keep the repositories separate