--- a/tests/test-command-template.t	Thu May 07 23:25:13 2015 -0700
+++ b/tests/test-command-template.t	Tue May 05 14:45:09 2015 -0400
@@ -1993,6 +1993,15 @@
   abort: template filter 'upper' is not compatible with keyword 'date'
   [255]
 
+Add a commit that does all possible modifications at once
+
+  $ echo modify >> third
+  $ touch b
+  $ hg add b
+  $ hg mv fourth fifth
+  $ hg rm a
+  $ hg ci -m "Modify, add, remove, rename"
+
 Error on syntax:
 
   $ echo 'x = "f' >> t
@@ -2606,7 +2615,9 @@
 Test splitlines
 
   $ hg log -Gv -R a --template "{splitlines(desc) % 'foo {line}\n'}"
-  @  foo future
+  @  foo Modify, add, remove, rename
+  |
+  o  foo future
   |
   o  foo third
   |
@@ -2640,6 +2651,8 @@
   o
   |
   o
+  |
+  o
   
   o
   |\
@@ -2665,7 +2678,9 @@
 Test word function (including index out of bounds graceful failure)
 
   $ hg log -Gv -R a --template "{word('1', desc)}"
-  @
+  @  add,
+  |
+  o
   |
   o
   |
@@ -2689,7 +2704,9 @@
 Test word third parameter used as splitter
 
   $ hg log -Gv -R a --template "{word('0', desc, 'o')}"
-  @  future
+  @  M
+  |
+  o  future
   |
   o  third
   |