Mercurial > hg
view tests/test-mactext.out @ 6933:17bdcd59b9ad
keyword: 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.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Fri, 22 Aug 2008 08:26:18 +0200 |
parents | 529d7887ecfe |
children |
line wrap: on
line source
[hooks] pretxncommit.cr = python:hgext.win32text.forbidcr pretxnchangegroup.cr = python:hgext.win32text.forbidcr Attempt to commit or push text file(s) using CR line endings in dea860dc51ec: f transaction abort! rollback completed abort: pretxncommit.cr hook failed hello<LF> hello<CR>