# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1344957075 25200
# Node ID 2917f82f60406d1b825204a38617f0c6cd2eaa18
# Parent  bd605568c5a0f67eade5257ff55159f0837afee3# Parent  c25531ed58b0b92814fbe3a7ac542ac7b4c28a23
templatekw: merge, preferring the second implementation

diff -r bd605568c5a0 -r 2917f82f6040 mercurial/templatekw.py
diff -r bd605568c5a0 -r 2917f82f6040 tests/test-template-engine.t
--- a/tests/test-template-engine.t	Tue Jul 10 08:43:32 2012 -0700
+++ b/tests/test-template-engine.t	Tue Aug 14 08:11:15 2012 -0700
@@ -36,4 +36,12 @@
   $ hg log --style=./mymap
   0 97e5f848f0936960273bbf75be6388cd0350a32b test
 
+  $ cat > changeset.txt << EOF
+  > {{p1rev}} {{p1node}} {{p2rev}} {{p2node}}
+  > EOF
+  $ hg ci -Ama
+  $ hg log --style=./mymap
+  0 97e5f848f0936960273bbf75be6388cd0350a32b -1 0000000000000000000000000000000000000000
+  -1 0000000000000000000000000000000000000000 -1 0000000000000000000000000000000000000000
+
   $ cd ..