Mercurial > hg
view .hgignore @ 1701:4ba8fe499df2
hgmerge: various cleanups
Details:
- put temporary file names into variables
- make all temporary file names end with random part
- cleanup FileMerge handling
- do not use hardlinks in FileMerge change test (breaks on FAT)
- try harder to keep file mtime unchanged in case of failed merge
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Mon, 06 Feb 2006 17:32:10 -0600 |
parents | fc3b41570082 |
children | e02fea13c69d |
line wrap: on
line source
syntax: glob *.elc *.orig *.rej *~ *.so *.pyc *.swp *.prof tests/*.err build dist doc/*.[0-9] doc/*.[0-9].{x,ht}ml MANIFEST patches mercurial/__version__.py syntax: regexp ^\.pc/