hg merge preview

[Mads Kiilerich]

Peter Toft wrote, On 08/31/2011 11:46 PM:
>
> I cannot get this to work.
>
> Is this 'p1()' syntax added to a recent HG version?
>
> At the moment I use version 1.7.5
>

Yes, it was introduced in 1.8.

/Mads


$ hg log -r 'a5f7 or min(a5f7:: and tagged())'
changeset:   12928:a5f7f1e9340e
user:        Kevin Bullock <kbullock at ringworld.org>
date:        Thu Nov 04 16:59:03 2010 -0500
summary:     revsets: let p1() and p2() return parents of working dir

changeset:   13515:2616325766e3
branch:      stable
tag:         1.8
user:        Gilles Moris <gilles.moris at free.fr>
date:        Tue Mar 01 07:28:20 2011 +0100
summary:     contrib: update tcsh_completion for Mercurial 1.8