Mercurial Mercurial > hg / 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-issue433.out
author Christian Ebert <blacktrash@gmx.net>
Fri, 22 Aug 2008 08:26:18 +0200
changeset 6933 17bdcd59b9ad
parent 3719 199dcb97a5b6
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3719
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     1
 
adding a
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     2
 
abort: 'doesnotexist' not found in manifest!
Mercurial