.hgignore
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Wed, 11 May 2016 16:06:58 +0200
changeset 1962 c00815786813
parent 1882 b6f934ed3570
child 2020 143c8e4dc22d
permissions -rw-r--r--
compat: adapt to the new destspace argument of destmerge The argument is currently ignored in the topic case for simplicity, but we properly accept it and propagate it to the original function to prevent crash and behavior regression in the non-topic case.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1839
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     1
syntax: glob
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     2
*.orig
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     3
*.pyc
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     4
tests/*.err
1882
b6f934ed3570 hgignore: also ignore testtimes
Augie Fackler <raf@durin42.com>
parents: 1839
diff changeset
     5
tests/.testtimes