# HG changeset patch # User Dirkjan Ochtman # Date 1232366281 -3600 # Node ID ca39dbc589c9505f226ac3ce8acde2da1c4025eb # Parent bd5c37d792e6ff5ea7da91e928e5df9b7389bfdd# Parent 876de22b70b87b558b2c1c2e301a881ced4df400 merge with crew-stable diff -r bd5c37d792e6 -r ca39dbc589c9 templates/coal/map --- a/templates/coal/map Mon Jan 19 12:38:54 2009 +0200 +++ b/templates/coal/map Mon Jan 19 12:58:01 2009 +0100 @@ -51,7 +51,7 @@ filerename = '{file|escape}@' filelogrename = 'base:{file|escape}@{node|short}' fileannotateparent = 'parent:{rename%filerename}{node|short}' -changesetchild = '{node|short}' +changesetchild = ' {node|short}' changelogchild = 'child{node|short}' fileannotatechild = 'child:{node|short}' tags = ../paper/tags.tmpl diff -r bd5c37d792e6 -r ca39dbc589c9 templates/paper/map --- a/templates/paper/map Mon Jan 19 12:38:54 2009 +0200 +++ b/templates/paper/map Mon Jan 19 12:58:01 2009 +0100 @@ -51,7 +51,7 @@ filerename = '{file|escape}@' filelogrename = 'base:{file|escape}@{node|short}' fileannotateparent = 'parent:{rename%filerename}{node|short}' -changesetchild = '{node|short}' +changesetchild = ' {node|short}' changelogchild = 'child{node|short}' fileannotatechild = 'child:{node|short}' tags = tags.tmpl diff -r bd5c37d792e6 -r ca39dbc589c9 tests/test-hgweb-commands.out Binary file tests/test-hgweb-commands.out has changed diff -r bd5c37d792e6 -r ca39dbc589c9 tests/test-hgweb-diffs.out --- a/tests/test-hgweb-diffs.out Mon Jan 19 12:38:54 2009 +0200 +++ b/tests/test-hgweb-diffs.out Mon Jan 19 12:58:01 2009 +0100 @@ -66,7 +66,7 @@ children - 78e4ebad7cdf + 78e4ebad7cdf files @@ -248,7 +248,7 @@ children - 78e4ebad7cdf + 78e4ebad7cdf files