# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1224414036 -7200
# Node ID e62c33732c1815f11b78ddaa8bf3a06bf524957e
# Parent  fb3df69aa78567b1022595e15b6b01feb81e381e# Parent  89431fbe0524a9be44f3260750e5412176c0bd2e
merge with crew

diff -r 89431fbe0524 -r e62c33732c18 templates/raw/map
--- a/templates/raw/map	Sun Oct 19 12:34:34 2008 +0200
+++ b/templates/raw/map	Sun Oct 19 13:00:36 2008 +0200
@@ -6,8 +6,8 @@
 difflineminus = '#line#'
 difflineat = '#line#'
 diffline = '#line#'
-changesetparent = '# Parent #node#'
-changesetchild = '# Child #node#'
+changesetparent = '# Parent  #node#'
+changesetchild = '# Child   #node#'
 filenodelink = ''
 fileline = '#line#'
 diffblock = '#lines#'
diff -r 89431fbe0524 -r e62c33732c18 tests/test-hgweb-commands.out
Binary file tests/test-hgweb-commands.out has changed
diff -r 89431fbe0524 -r e62c33732c18 tests/test-keyword.out
--- a/tests/test-keyword.out	Sun Oct 19 12:34:34 2008 +0200
+++ b/tests/test-keyword.out	Sun Oct 19 13:00:36 2008 +0200
@@ -416,7 +416,7 @@
 # User User Name <user@example.com>
 # Date 3 0
 # Node ID cfa68229c1167443337266ebac453c73b1d5d16e
-# Parent bb948857c743469b22bbf51f7ec8112279ca5d83
+# Parent  bb948857c743469b22bbf51f7ec8112279ca5d83
 xa
 
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000