projects / swc-version-control-svn.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 48b43a4 e287189)
Merge remote tracking branch 'version-control/namespaced' into namespaced namespaced
authorW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 20:02:58 +0000 (13:02 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 20:02:58 +0000 (13:02 -0700)
commit6815d9f2a704c6f59e1080c720c26e51392eb810
tree90f42bec3c2e70cffc90eb6e8465d8be189a8e93tree | snapshot
parent48b43a4ed19e3d8a16caa109c3849f5a57ca212acommit | diff
parente287189e9ac0e7be3dc0140f60ee25321082a60acommit | diff
Merge remote tracking branch 'version-control/namespaced' into namespaced

This is a no-op merge, explicitly considering and rejecting the
SVN-specific removal from the subject-level master branch.  This
avoids merge conflicts if an aggregation branch wants to merge both
our namespaced branch and the subject-level namespaced branch.

* version-control/namespaced:
  version-control/svn: Remove SVN-specific content
Subversion tool-level material for Software Carpentry