X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=t%2Ft4034-diff-words.sh;h=c374aa4c1c60e9a12cf1ebf5587daf3656e4851a;hb=2177dc69cd693eeb52def931f41ad4f3a766846e;hp=37aeab0d5c7415a54384c90708626f6a5807acee;hpb=5c359a66586cfa802f9a4b205da9750582bdb9ec;p=git.git diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh index 37aeab0d5..c374aa4c1 100755 --- a/t/t4034-diff-words.sh +++ b/t/t4034-diff-words.sh @@ -307,4 +307,30 @@ test_language_driver python test_language_driver ruby test_language_driver tex +test_expect_success 'word-diff with diff.sbe' ' + cat >expect <<-\EOF && + diff --git a/pre b/post + index a1a53b5..bc8fe6d 100644 + --- a/pre + +++ b/post + @@ -1,3 +1,3 @@ + a + + [-b-]{+c+} + EOF + cat >pre <<-\EOF && + a + + b + EOF + cat >post <<-\EOF && + a + + c + EOF + test_when_finished "git config --unset diff.suppress-blank-empty" && + git config diff.suppress-blank-empty true && + word_diff --word-diff=plain +' + test_done