Mercurial > hg > mercurial-talk

changeset 353:5292f85ffa49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed conflicted -> unresolved
author Martin Geisler <mg@aragost.com>
date Wed, 20 Jun 2012 17:32:52 +0200
parents 99d91cd13622
children 30ec1de4d3e4
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
@@ -405,7 +405,7 @@
 
 \item \cmd{hgignore()}: tracked files that \emph{would} be ignored
 
-\item \cmd{conflicted()}: like \cmd{hg resolve -{}-list} after a merge
+\item \cmd{unresolved()}: like \cmd{hg resolve -{}-list} after a merge
 
 \end{itemize}