diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:18:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:18:10 +0900 |
| commit | 53083f8547cd45cdfabcf2f1bd21461cd6769189 (patch) | |
| tree | b55468902cea598ecdab645f4128e40ed3ec0f2b /t/t4051-diff-function-context.sh | |
| parent | 70f8ba55242ca7ebf46b43d8b29d09c552acce1f (diff) | |
| parent | 1fa8a66bf76953c6fb9cfe5e17b26a3a0920f538 (diff) | |
| download | git-53083f8547cd45cdfabcf2f1bd21461cd6769189.tar.gz git-53083f8547cd45cdfabcf2f1bd21461cd6769189.tar.xz | |
Merge branch 'mb/diff-default-to-indent-heuristics'
Make the "indent" heuristics the default in "diff" and diff.indentHeuristics
configuration variable an escape hatch for those who do no want it.
* mb/diff-default-to-indent-heuristics:
add--interactive: drop diff.indentHeuristic handling
diff: enable indent heuristic by default
diff: have the diff-* builtins configure diff before initializing revisions
diff: make the indent heuristic part of diff's basic configuration
Diffstat (limited to 't/t4051-diff-function-context.sh')
| -rwxr-xr-x | t/t4051-diff-function-context.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh index 6154acb45..3e6b485ec 100755 --- a/t/t4051-diff-function-context.sh +++ b/t/t4051-diff-function-context.sh @@ -72,7 +72,8 @@ test_expect_success 'setup' ' # overlap function context of 1st change and -u context of 2nd change grep -v "delete me from hello" <"$dir/hello.c" >file.c && - sed 2p <"$dir/dummy.c" >>file.c && + sed "2a\\ + extra line" <"$dir/dummy.c" >>file.c && commit_and_tag changed_hello_dummy file.c && git checkout initial && |