Mercurial > hg
view .hgignore @ 3509:9de0e64545a3
Test that we notice the empty files from the second parent during a merge
This didn't work with 0.9.1, but was fixed by 05257fd28591.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Wed, 25 Oct 2006 02:51:27 -0300 |
parents | 12d1475b48df |
children | e6cc4d4f5a81 |
line wrap: on
line source
syntax: glob *.elc *.orig *.rej *~ *.o *.so *.pyc *.swp *.prof tests/.coverage* tests/annotated tests/*.err build contrib/hgsh/hgsh dist doc/*.[0-9] doc/*.[0-9].gendoc.txt doc/*.[0-9].{x,ht}ml MANIFEST patches mercurial/__version__.py .DS_Store syntax: regexp ^\.pc/ Output/Mercurial-[0-9.]*.exe