.hgignore
author Gregory Szorc <gregory.szorc@gmail.com>
Sun, 13 Mar 2016 15:46:03 -0700
changeset 30767 1af8972249c6e4ae7fd8618b1fb18b68f6fe5744
parent 30665 17b85d739b6270453914b9bac2354bb5af43c96f
child 31384 e63dfbbdbd078a6c822e1903c298783d261eee82
permissions -rw-r--r--
resolve: print a warning when marking a file with conflict markers If you are using internal:merge or any mergetool that inserts conflict markers and use `hg resolve -m`, there's a chance you may accidentally mark a file with conflict markers as resolved. This is almost always unintended. This patch adds a warning so fewer people will shoot themselves with this footgun.

syntax: glob

*.elc
*.tmp
*.orig
*.rej
*~
*.mergebackup
*.o
*.so
*.dll
*.exe
*.pyd
*.pyc
*.pyo
*$py.class
*.swp
*.prof
*.zip
\#*\#
.\#*
tests/.coverage*
tests/.testtimes*
tests/.hypothesis
tests/hypothesis-generated
tests/annotated
tests/*.err
tests/htmlcov
build
contrib/chg/chg
contrib/hgsh/hgsh
contrib/vagrant/.vagrant
dist
packages
doc/common.txt
doc/*.[0-9]
doc/*.[0-9].txt
doc/*.[0-9].gendoc.txt
doc/*.[0-9].{x,ht}ml
MANIFEST
MANIFEST.in
patches
mercurial/__modulepolicy__.py
mercurial/__version__.py
mercurial/hgpythonlib.h
mercurial.egg-info
.DS_Store
tags
cscope.*
.idea/*
i18n/hg.pot
locale/*/LC_MESSAGES/hg.mo
hgext/__index__.py

# files installed with a local --pure build
mercurial/base85.py
mercurial/bdiff.py
mercurial/diffhelpers.py
mercurial/mpatch.py
mercurial/osutil.py
mercurial/parsers.py

syntax: regexp
^\.pc/
^\.(pydev)?project

# hackable windows distribution additions
^hg-python
^hg.py$