Mercurial > hg
view tests/test-revert-flags @ 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 | d0dbae32517c |
children |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" execbit || exit 80 hg init repo cd repo echo foo > foo chmod 644 foo hg ci -qAm '644' chmod 755 foo hg ci -qAm '755' echo '% reverting to rev 0' hg revert -a -r 0 hg st hg diff --git