diff options
Diffstat (limited to 'third_party/git/t/t4057-diff-combined-paths.sh')
| -rwxr-xr-x | third_party/git/t/t4057-diff-combined-paths.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/t/t4057-diff-combined-paths.sh b/third_party/git/t/t4057-diff-combined-paths.sh index dff36b77ec..4f4b541658 100755 --- a/third_party/git/t/t4057-diff-combined-paths.sh +++ b/third_party/git/t/t4057-diff-combined-paths.sh @@ -33,7 +33,7 @@ test_expect_success 'trivial merge - combine-diff empty' ' ' -test_expect_success 'only one trully conflicting path' ' +test_expect_success 'only one truly conflicting path' ' git checkout side && for i in $(test_seq 2 9) do |