Mercurial > hg
view tests/test-dispatch @ 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 | 5db730475d6d |
children | dbc40381620e |
line wrap: on
line source
#!/bin/sh # test command parsing and dispatch hg init a cd a echo a > a hg ci -Ama -d '0 0' echo "# missing arg" hg cat echo '% [defaults]' hg cat a cat >> $HGRCPATH <<EOF [defaults] cat = -v EOF hg cat a echo '% no repo' cd .. hg cat exit 0