Mercurial > hg
view tests/test-diff-unified @ 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 | 65029a3aafc2 |
children | 07faba78cf5a |
line wrap: on
line source
#!/bin/sh hg init repo cd repo cat > a <<EOF c c a a b a a c c EOF hg ci -Am adda cat > a <<EOF c c a a dd a a c c EOF echo '% default context' hg diff --nodates echo '% invalid --unified' hg diff --nodates -U foo echo '% --unified=2' hg diff --nodates -U 2 echo '% diff.unified=2' hg --config diff.unified=2 diff --nodates echo '% diff.unified=2 --unified=1' hg diff --nodates -U 1 echo '% invalid diff.unified' hg --config diff.unified=foo diff --nodates exit 0