silverstripe-installer/.mergesources.yml

# 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
  jsparty: /open/modules/jsparty/trunk
MINOR Added mergesources.yml git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@90858 467b73ca-7a2a-4603-9d3b-597d59a354a9 2009-11-05 02:29:21 +01:00			`# 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.`
MINOR Setting trunk in .mergesources git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@90889 467b73ca-7a2a-4603-9d3b-597d59a354a9 2009-11-05 04:10:23 +01:00			`trunk:`
MINOR Mergeinfo git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92262 467b73ca-7a2a-4603-9d3b-597d59a354a9 2009-11-19 21:26:59 +01:00			`.: /open/phpinstaller/trunk`
MINOR Setting trunk in .mergesources git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@90889 467b73ca-7a2a-4603-9d3b-597d59a354a9 2009-11-05 04:10:23 +01:00			`sapphire: /open/modules/sapphire/trunk`
			`cms: /open/modules/cms/trunk`
MINOR: reverted previous commit. Note to self dont work on sunday nights, sigh git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113086 467b73ca-7a2a-4603-9d3b-597d59a354a9 2010-10-24 08:47:18 +02:00			`jsparty: /open/modules/jsparty/trunk`