.hgignore
author mpm@selenic.com
Fri, 22 Jul 2005 19:23:00 -0500
changeset 764 eea96285cbf9
parent 740 d2422f10c136
child 794 cdf61d3d3904
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rw-r--r--
Don't mark files with 'm'erge unless we're actually merging branches For 3-way merges, we were marking files as 'm', which should only be used for branch merges. This was causing files to show up in 'hg status' that aren't actually modified.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
717
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset
     1
\.orig$
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset
     2
\.rej$
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset
     3
~$
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset
     4
\.so$
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset
     5
\.pyc$
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset
     6
\.swp$
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset
     7
^build/
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset
     8
^dist/
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset
     9
^doc/.*\.[0-9]$
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset
    10
^MANIFEST$
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset
    11
^.pc/
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset
    12
^patches/
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset
    13
^mercurial/__version__.py$