Mercurial > hg
view tests/test-rebuildstate @ 6521:a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
It is possible to specify that one of the internal merge tools (internal:fail,
internal:local or internal:other) should be used for performing merges on files
matching a given pattern. This test makes sure that such a setting actually
works.
author | Dov Feldstern <dfeldstern@fastimap.com> |
---|---|
date | Fri, 04 Apr 2008 02:20:58 +0300 |
parents | ffeb926d57ce |
children |
line wrap: on
line source
#!/bin/sh # basic test for hg debugrebuildstate hg init repo cd repo touch foo bar hg ci -Am 'add foo bar' touch baz hg add baz hg rm bar hg debugrebuildstate echo '% state dump after' hg debugstate --nodates | sort echo '% status' hg st -A