.hgignore
author Christian Ebert <blacktrash@gmx.net>
Fri, 22 Aug 2008 08:26:18 +0200
changeset 485 5c3637b12e88
parent 450 86c17b3e9100
permissions -rw-r--r--
Avoid additional conflicts during merge/resolve Make merge and resolve trigger kwtemplater.restricted to compare data without keyword expansion. The keyword stays outside the conflict: $Keyword$ <<<<<<< local bar ======= foo >>>>>>> other and will again be expanded on commit. Demonstrate in test case.

syntax: glob

*.pyc
*.pyo
*~
*.swp
*.orig
*.rej
.DS_Store

build/*
MANIFEST