52   summary:     c

    52   summary:     c

    53   

    53   

    54 

    54 

    55   $ hg parents -r 3 c

    55   $ hg parents -r 3 c

    56   abort: 'c' not found in manifest!

    56   abort: 'c' not found in manifest!

    58 

    58 

    59   $ hg parents -r 2

    59   $ hg parents -r 2

    60   changeset:   1:d786049f033a

    60   changeset:   1:d786049f033a

    61   user:        test

    61   user:        test

    62   date:        Thu Jan 01 00:00:01 1970 +0000

    62   date:        Thu Jan 01 00:00:01 1970 +0000

    93   

    93   

    94   $ cd ..

    94   $ cd ..

    95 

    95 

    96   $ hg parents -r 2 glob:a

    96   $ hg parents -r 2 glob:a

    97   abort: can only specify an explicit filename

    97   abort: can only specify an explicit filename

    99 

    99 

   100 

   100 

   101 merge working dir with 2 parents, hg parents c

   101 merge working dir with 2 parents, hg parents c

   102 

   102 

   103   $ HGMERGE=true hg merge

   103   $ HGMERGE=true hg merge