--- a/tests/test-template-keywords.t Sun Jan 20 11:39:16 2019 +0900
+++ b/tests/test-template-keywords.t Sun Jan 20 11:51:21 2019 +0900
@@ -1063,8 +1063,18 @@
$ hg ci -qAm h3a
$ hg merge -q 2
$ hg log -Gr'::wdir()' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
- hg: parse error: invalid argument for revspec
- [255]
+ o 2147483647: at3+2,3 t3+2,3
+ |\
+ | @ 12: at3+1,1 t3+1,1
+ | |
+ | o 3: at3+0,0 t3+0,0
+ | |
+ @ | 2: t2+0,0
+ |/
+ o 1: t1+0,0
+ |
+ o 0: null+1,1
+
$ hg ci -m merge
$ hg log -Gr'::.' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"