Mercurial > hg
view tests/test-issue352.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 | 09847b90beae |
children |
line wrap: on
line source
adding he llo abort: '\n' and '\r' disallowed in filenames: 'he\rllo' adding he llo abort: '\n' and '\r' disallowed in filenames: 'he\rllo' adding hell o abort: '\n' and '\r' disallowed in filenames: 'hell\no' adding hell o abort: '\n' and '\r' disallowed in filenames: 'hell\no' f he llo he llo f hell o hell o