Mercurial > hg
view tests/test-bad-extension.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 | f8a86ea7521b |
children | 833d1250ce00 |
line wrap: on
line source
*** failed to import extension badext from .../badext.py: bit bucket overflow *** failed to import extension badext2: No module named badext2 hg help [COMMAND] show help for a command, extension, or list of commands