Mercurial > hg
view .hgignore @ 4682:dc5920ea12f8
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 22 Jun 2007 20:44:40 -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