Issue a warning if "-r ." is used with two working directory parents. Rationale for not aborting instead: The first parent is usually more important as it is the local branch during a merge and commands like 'hg diff' and 'hg diff -r.' behave still identically (except for the warning of course). Added a test for log -r. with one and two parents.

     1

#!/bin/sh

     2

     3

hg

     4

hg -q

     5

hg help

     6

hg -q help

     7

hg add -h

     8

hg add --skjdfks

     9

hg help diff

    10

hg help status

    11

hg -q help status

    12

hg help foo

    13

hg skjdfks

    14

    15

exit 0