diff -r 39fd67552297 -r 5b7da468531b tests/test-merge-commit
--- a/tests/test-merge-commit	Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-merge-commit	Tue May 19 23:02:17 2009 +0200
@@ -33,7 +33,7 @@
 echo line1 > bar
 hg ci -m '4: revert content change from rev 2'
 
-hg log --template '#rev#:#node|short# #parents#\n'
+hg log --template '{rev}:{node|short} {parents}\n'
 echo '% this should use bar@rev2 as the ancestor'
 hg --debug merge 3
 echo '% contents of bar should be line1 line2'
@@ -64,7 +64,7 @@
 echo line1 > bar
 hg ci -m '4: revert content change from rev 2'
 
-hg log --template '#rev#:#node|short# #parents#\n'
+hg log --template '{rev}:{node|short} {parents}\n'
 echo '% this should use bar@rev2 as the ancestor'
 hg --debug merge 3
 echo '% contents of bar should be line1 line2'