Mercurial > hg
view tests/test-diff-binary-file @ 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 | 0934fef871f3 |
children | 6c82beaaa11a |
line wrap: on
line source
#!/bin/sh hg init a cd a cp $TESTDIR/binfile.bin . hg add binfile.bin hg ci -m 'add binfile.bin' -d '0 0' echo >> binfile.bin hg ci -m 'change binfile.bin' -d '0 0' hg revert -r 0 binfile.bin hg ci -m 'revert binfile.bin' -d '0 0' echo % diff -r 0 -r 1 hg diff --nodates -r 0 -r 1 echo % diff -r 0 -r 2 hg diff --nodates -r 0 -r 2 echo % diff --git -r 0 -r 1 hg diff --git -r 0 -r 1 echo % diff --git -r 0 -r 2 hg diff --git -r 0 -r 2