Mercurial > hg

view tests/test-debugrename.out @ 6933:17bdcd59b9ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 5a088ac232e6
children f2618cacb485
line wrap: on
line source

adding a
b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
a renamed from b:9a263dd772e0159ddfa70fb8a448bb6c7ec8c69f
% test with --rev
b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3