Mercurial > hg
view tests/test-issue842.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 | 4b0c9c674707 |
children |
line wrap: on
line source
adding a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved % should issue warning adding a created new head 0 files updated, 0 files merged, 1 files removed, 0 files unresolved % should not issue warning 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch testing % should not issue warning