Skip to content

Commit

Permalink
MINOR Setting trunk in .mergesources
Browse files Browse the repository at this point in the history
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@90889 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information
ischommer authored and Sam Minnee committed Feb 2, 2011
1 parent 6ffe876 commit 371f6c3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .mergesources.yml
Original file line number Diff line number Diff line change
@@ -1,7 +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
trunk:
sapphire: /open/modules/sapphire/trunk
cms: /open/modules/cms/trunk
jsparty: /open/modules/jsparty/trunk

0 comments on commit 371f6c3

Please sign in to comment.