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

syntax: glob

     2

     3

*.elc

     4

*.orig

     5

*.rej

     6

*~

     7

*.so

     8

*.pyc

     9

*.swp

    10

*.prof

    11

tests/*.err

    12

build

    13

dist

    14

doc/*.[0-9]

    15

doc/*.[0-9].gendoc.txt

    16

doc/*.[0-9].{x,ht}ml

    17

MANIFEST

    18

patches

    19

mercurial/__version__.py

    20

    21

syntax: regexp

    22

^\.pc/