.hgignore
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Mon, 15 Aug 2016 00:19:44 +0200
changeset 1984 2a07df823588
parent 1882 b6f934ed3570
child 2020 143c8e4dc22d
permissions -rw-r--r--
destination: honor the sourceset argument of _destmerge Mercurial gained a "sourceset" argument to compute the merge destination of any changeset (the one in the 'sourceset'). This now works for the version in topic too. The support is quite basic (because we pick only one changeset from the sourceset) but that's a start.
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