From 3eb3a00c91c95c747a085de829e5c4f88da597fa Mon Sep 17 00:00:00 2001 From: ischommer Date: Thu, 5 Nov 2009 01:29:21 +0000 Subject: [PATCH] MINOR Added mergesources.yml git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@90858 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- .mergesources.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .mergesources.yml diff --git a/.mergesources.yml b/.mergesources.yml new file mode 100644 index 0000000..7d8deea --- /dev/null +++ b/.mergesources.yml @@ -0,0 +1,7 @@ +# 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. +2.3: + sapphire: /open/modules/sapphire/branches/2.3 + cms: /open/modules/cms/branches/2.3 + jsparty: /open/modules/jsparty/branches/2.3 \ No newline at end of file