merge: make error message consistent with other commands If a merge is attempted when another merge is already ongoing, we give the message "outstanding uncommitted merges". Many other commands (such as backout, rebase, histedit) give the same message in singular form. Since the singular form also seems to make more sense, let's use that for 'hg merge' as well.

     1

  $ hg init

     2

  $ touch unknown

     3

     4

  $ touch a

     5

  $ hg add a

     6

  $ hg ci -m "1"

     7

     8

  $ touch b

     9

  $ hg add b

    10

  $ hg ci -m "2"

    11

    12

Should show unknown

    13

    14

  $ hg status

    15

  ? unknown

    16

  $ hg revert -r 0 --all

    17

  removing b

    18

    19

Should show unknown and b removed

    20

    21

  $ hg status

    22

  R b

    23

  ? unknown

    24

    25

Should show a and unknown

    26

    27

  $ ls

    28

  a

    29

  unknown