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