Mercurial > hg-stable
view .hgignore @ 830:ca080d28d0af
If rejects are empty after using the editor, merge with diff+patch was ok.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 04 Aug 2005 17:23:31 +0100 |
parents | 0902ffece4b4 |
children | d2bf8b9534b1 c2e77581bc84 |
line wrap: on
line source
\.orig$ \.rej$ ~$ \.so$ \.pyc$ \.swp$ ^tests/.*\.err$ ^build/ ^dist/ ^doc/.*\.[0-9]$ ^MANIFEST$ ^\.pc/ ^patches/ ^mercurial/__version__.py$