Mercurial > hg
view .hgignore @ 4362:465b9ea02868
Import 3-way merge code from bzr
merge3.py is imported as contrib/simplemerge
test_merge3.py is imported as tests/test-simplemerge.py
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 16 Apr 2007 20:17:39 -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