Have verbose and debug flag print the changeset rev and hash when committing.
Besides updating the tests output, I had to push back at the end the test for
issue1193 in test-commit, solved by cset
4386a7706828, because it was using the
current date for commit and was randomizing the subsequent hash.
Backed out changeset
d557749c627a
Replace this change with a better one.
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.