diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-16 13:08:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-16 13:08:46 -0800 |
| commit | d1c0fe8d9b16bf8b6b1cc0e83fac6670e3f64f0f (patch) | |
| tree | 8885156cb43cf3b23cb30f0409c57ac56c3b1c26 /t/t3206-range-diff.sh | |
| parent | Merge branch 'hw/doc-in-header' (diff) | |
| parent | range-diff: clear `other_arg` at end of function (diff) | |
| download | git-d1c0fe8d9b16bf8b6b1cc0e83fac6670e3f64f0f.tar.gz git-d1c0fe8d9b16bf8b6b1cc0e83fac6670e3f64f0f.zip | |
Merge branch 'dl/range-diff-with-notes'
Code clean-up.
* dl/range-diff-with-notes:
range-diff: clear `other_arg` at end of function
range-diff: mark pointers as const
t3206: fix incorrect test name
Diffstat (limited to 't/t3206-range-diff.sh')
| -rwxr-xr-x | t/t3206-range-diff.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index ec2b456dbb..0575dd72b1 100755 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@ -638,7 +638,7 @@ test_expect_success 'format-patch --range-diff with --notes' ' test_cmp expect actual ' -test_expect_success 'format-patch --range-diff with --notes' ' +test_expect_success 'format-patch --range-diff with format.notes config' ' git notes add -m "topic note" topic && git notes add -m "unmodified note" unmodified && test_when_finished git notes remove topic unmodified && |