##// END OF EJS Templates
templatekw: merge, preferring the second implementation
Bryan O'Sullivan -
r17358:2917f82f merge default
parent child Browse files
Show More
@@ -36,4 +36,12 b''
36 $ hg log --style=./mymap
36 $ hg log --style=./mymap
37 0 97e5f848f0936960273bbf75be6388cd0350a32b test
37 0 97e5f848f0936960273bbf75be6388cd0350a32b test
38
38
39 $ cat > changeset.txt << EOF
40 > {{p1rev}} {{p1node}} {{p2rev}} {{p2node}}
41 > EOF
42 $ hg ci -Ama
43 $ hg log --style=./mymap
44 0 97e5f848f0936960273bbf75be6388cd0350a32b -1 0000000000000000000000000000000000000000
45 -1 0000000000000000000000000000000000000000 -1 0000000000000000000000000000000000000000
46
39 $ cd ..
47 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now