Mercurial > hg-stable

view tests/test-conflict.out @ 1562:2f97af0b522c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix walkhelper on windows. The ''seen'' dictionary stores paths in canonical form, so the walkhelp must also provide paths in that form, otherwise the changed files are listed twice.
author Christian Boos <cboos@neuf.fr>
date Thu, 01 Dec 2005 10:48:18 -0600
parents 5a034646e472
children 7544700fd931
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a