diff options
| author |  Jeff King <peff@peff.net> | 2008-10-26 00:42:25 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-10-26 14:09:48 -0700 |
| commit | df5e91fc2c95e051744ec9b9de66869d2b323037 (patch) | |
| tree | af14297342113f755d62b1f2c7367c9a1c90e528 /Documentation/git-merge-base.txt | |
| parent | document the diff driver textconv feature (diff) | |
| download | tgif-df5e91fc2c95e051744ec9b9de66869d2b323037.tar.xz | |
add userdiff textconv tests
These tests provide a basic sanity check that textconv'd
files work. The tests try to describe how this configuration
_should_ work; thus some of the tests are marked to expect
failure.
In particular, we fail to actually textconv anything because
the 'diff.foo.binary' config option is not set, which will
be fixed in the next patch.
This also means that some "expect_failure" tests actually
seem to be fixed; in reality, this is just because textconv
is broken and its failure mode happens to make these tests
work.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-base.txt')
0 files changed, 0 insertions, 0 deletions