Mercurial > hg
view tests/test-symlink-os-yes-fs-no.py.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 | 24fd94ed1cc0 |
children | a3d73b3e1f8a |
line wrap: on
line source
requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 4 changes to 4 files updating working directory 4 files updated, 0 files merged, 0 files removed, 0 files unresolved