Mercurial > hg-stable

diff tests/test-resolve.t @ 38545:e8c33e27ee9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: add support for log-like template keywords and functions It uses wctx as the associated revision since "hg resolve" is the command to manipulate the working directory files.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 01 Jul 2018 22:11:23 +0900
parents 7bc33d677c0c
children 6c8e3c847977
line wrap: on
line diff
--- a/tests/test-resolve.t	Sun Jul 01 22:06:53 2018 +0900
+++ b/tests/test-resolve.t	Sun Jul 01 22:11:23 2018 +0900
@@ -162,6 +162,10 @@
    }
   ]
 
+  $ hg resolve -l -T '{path} {status} {p1rev} {p2rev}\n'
+  file1 R 2 1
+  file2 U 2 1
+
 resolve -m without paths should mark all resolved
 
   $ hg resolve -m