how can you tell you have merged?

Douglas Philips dgou at mac.com
Thu Sep 11 12:40:13 UTC 2008


On or about 2008 Sep 11, at 4:15 AM, Adrian Buehlmann indited:
> 'hg glog' [1] is also quite nice: it marks the two parents of the
> working directory with '@' signs after a merge (before the commit):
>
> This was done with
>
> '''
> [ui]
> style = compact
> '''

or:
hg glog --style=compact ...

If the two changesets being merged don't show on the same screen (even  
with compact) then this could give you a false sense of the state of  
the working directory. hg parents tells you exactly what "mercurial is  
thinking" is going on... :)

--Doug





More information about the Mercurial mailing list