Mercurial > hg
view tests/test-diff-hashes @ 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 | c2d0ed7f4af8 |
children |
line wrap: on
line source
#!/bin/sh hg init a cd a hg diff not found echo bar > foo hg add foo hg ci -m 'add foo' -d '1000000 0' echo foobar > foo hg ci -m 'change foo' -d '1000001 0' echo 'quiet:' hg --quiet diff -r 0 -r 1 echo echo 'normal:' hg diff -r 0 -r 1 echo echo 'verbose:' hg --verbose diff -r 0 -r 1 echo echo 'debug:' hg --debug diff -r 0 -r 1 echo