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

  $ echo "[extensions]" >> $HGRCPATH

     2

  $ echo "mq=" >> $HGRCPATH

     3

     4

  $ hg init

     5

     6

  $ echo 'base' > base

     7

  $ hg ci -Ambase

     8

  adding base

     9

    10

  $ hg qnew -mmqbase mqbase

    11

    12

  $ hg qsave

    13

  $ hg qrestore 2

    14

  restoring status: hg patches saved state

    15