annotate mercurial/__init__.py @ 23021:41770cee3c6a

test-resolve: add test resolving one of two files The tests for resolve are missing a lot of cases. Let's start by adding another file to the test repo, so we can test resolving one of two files.
author Martin von Zweigbergk <martinvonz@gmail.com>
date Wed, 08 Oct 2014 21:07:30 -0700
parents 9117c6561b0b
children 4374d819ccd5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source