From 6644748bcf93e8d3f1729e6e2c4f3018ec58507b Mon Sep 17 00:00:00 2001
From: ischommer <ischommer@467b73ca-7a2a-4603-9d3b-597d59a354a9>
Date: Fri, 16 Jul 2010 00:13:49 +0000
Subject: [PATCH] MINOR Added .mergesources.yml

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.3@108040 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .mergesources.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .mergesources.yml

diff --git a/.mergesources.yml b/.mergesources.yml
new file mode 100644
index 0000000..29bd1dd
--- /dev/null
+++ b/.mergesources.yml
@@ -0,0 +1,11 @@
+# Data source for the "arb" svn merge tool (see http://github.com/sminnee/arborist).
+# Keeps track of all opensource branches of submodules 
+# that could be merged back to the current submodule paths.
+trunk:
+  .: /open/phpinstaller/trunk
+  sapphire: /open/modules/sapphire/trunk
+  cms: /open/modules/cms/trunk
+2.4:
+  .: /open/phpinstaller/branches/2.4
+  sapphire: /open/modules/sapphire/branches/2.4
+  cms: /open/modules/cms/branches/2.4
\ No newline at end of file