how can you tell you have merged?

[Adrian Buehlmann]

On 11.09.2008 08:13, Patrick Waugh wrote:
> After finally getting up and running on ubuntu, I'm now back to
> reviewing the hg manual, and on my second read have a question.
> 
> Let's say you do this:
> 
> hg clone hello my-new-hello
> cd my-new-hello
> sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c
> hg commit -m 'A new hello for a new day.'
> hg pull ../my-hello
> hg merge
> 
> Now, how can you tell that you have done a merge?
> 
> hg heads give us:
> 
> patrick at psychotic:~/repos/my-new-hello$ hg heads
> 6[tip]:4   90f041906e70   2008-09-10 23:26 -0500   patrick
>   Added extra line of output
> 
> 5   53781dd78cf6   2008-09-11 00:38 -0500   patrick
>   A new hello for a new day.
> 
> So, since I'm still seeing two heads, how would I know (if I left,
> came back and had forgot I had done a merg) that the merge was
> complete but that I still needed a commit?
> 

Maybe, it would be helpful if hg status would print a special
notice at the end _if_ the working directory has *two* parent
revisions.

Maybe something like this:

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