Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.

     1

#!/bin/sh

     2

     3

mkdir t

     4

cd t

     5

hg init

     6

echo a > a

     7

hg add a

     8

hg commit -m "test" -d "1000000 0"

     9

hg verify

    10

hg parents

    11

hg status

    12

hg rollback

    13

hg verify

    14

hg parents

    15

hg status