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

adding a

     2

Now at: a.patch

     3

applying b.patch

     4

applying c.patch

     5

Now at: c.patch

     6

Now at: b.patch