Mercurial > hg > soundsoftware-site

diff test/fixtures/.svn/text-base/wiki_pages.yml.svn-base @ 120:cd2282d2aa55 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
author Chris Cannam
date Thu, 13 Jan 2011 14:33:08 +0000
parents 8661b858af72
children
line wrap: on
line diff
--- a/test/fixtures/.svn/text-base/wiki_pages.yml.svn-base	Thu Jan 13 13:21:03 2011 +0000
+++ b/test/fixtures/.svn/text-base/wiki_pages.yml.svn-base	Thu Jan 13 14:33:08 2011 +0000
@@ -62,4 +62,10 @@
   wiki_id: 2
   protected: false
   parent_id: 8
-  
\ No newline at end of file
+wiki_pages_010: 
+  created_on: 2007-03-08 00:18:07 +01:00
+  title: Этика_менеджмента
+  id: 10
+  wiki_id: 1
+  protected: false
+  parent_id: