add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.

     1

a

     2

checking changesets

     3

checking manifests

     4

crosschecking files in changesets and manifests

     5

checking files

     6

1 files, 1 changesets, 1 total revisions

     7

a not present

     8

checking changesets

     9

checking manifests

    10

crosschecking files in changesets and manifests

    11

checking files

    12

1 files, 1 changesets, 1 total revisions

    13

a