Mercurial > hg
view tests/test-debugrename @ 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 | 5a088ac232e6 |
children |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg ci -Am t hg mv a b hg ci -Am t1 hg debugrename b hg mv b a hg ci -Am t2 hg debugrename a echo % test with --rev hg debugrename --rev 1 b