how can you tell you have merged?

[Adrian Buehlmann]

On 11.09.2008 20:38, Adrian Buehlmann wrote:
> Maybe something like this:
> 
> '''
>> hg status
> M x
> (uncommitted merge, use 'hg parents' to show the merged revisions)
> '''

Since changing the default output of hg status (even in the two parents
case) is forbidden, we still might do it with --verbose:

'''
> hg status -v
M x
(uncommitted merge, use 'hg parents' to show the merged revisions)
'''

(we could use the verbose flag to separate poor command line
users from poor IDE's which remote control hg over the
command line for doing a merge).