Mercurial > hg

comparison mercurial/merge.py @ 23021:41770cee3c6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ff93aa006e6a
children 3177d710630d 902554884335
comparison
equal deleted inserted replaced
23020:dfad19274d85 23021:41770cee3c6a