Mercurial > hg > mercurial-talk

changeset 346:e1ffd0b18d71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix unwanted en-dash
author Martin Geisler <mg@aragost.com>
date Wed, 20 Jun 2012 17:15:59 +0200
parents 1068287417e6
children 33e70647b112
files query-languages.tex
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/query-languages.tex
+++ b/query-languages.tex
@@ -407,7 +407,7 @@
 
 \item \cmd{tracked()}: all tracked files
 
-\item \cmd{conflicted()}: like \cmd{hg resolve --list} after a merge
+\item \cmd{conflicted()}: like \cmd{hg resolve -{}-list} after a merge
 
 \end{itemize}