Mercurial > hg
view .hgignore @ 1798:d610fe0e6893
hgmerge: do not use file with markers in tools merging themselves
This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Thu, 23 Feb 2006 18:10:04 +0100 |
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/