Mercurial > hg

diff tests/test-contrib.t @ 18337:557c8522aec0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: better test coverage of merges of flags This makes existing problems with merges of symlinks and files more obvious and add test coverage for tricky merges without real common ancestors.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 01:05:12 +0100
parents 8aeb2f1ae94c
children 94a22595f702
line wrap: on
line diff