Mercurial Mercurial > test / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-keyword.hg
author Christian Ebert <blacktrash@gmx.net>
Fri, 22 Aug 2008 08:26:18 +0200
changeset 485 5c3637b12e88
parent 392 45a318c5ea20
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     1
 
(binary:application/octet-stream)
test