diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-12 09:47:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-12 09:47:37 -0700 |
| commit | e6b8f80653063cd41903c599ec9ca83be3d3afa5 (patch) | |
| tree | 52d1e93fe3edc581275f92f98981c3103471af58 /contrib/subtree/t/t7900-subtree.sh | |
| parent | 2c44b7a53bf49430f231a71668d2a1c4ea9f5591 (diff) | |
| parent | 2e3a16b279a9df2e498187871c67e623e12bc8a4 (diff) | |
| download | git-e6b8f80653063cd41903c599ec9ca83be3d3afa5.tar.gz | |
Merge branch 'vs/typofix'
* vs/typofix:
Spelling fixes
Diffstat (limited to 'contrib/subtree/t/t7900-subtree.sh')
| -rwxr-xr-x | contrib/subtree/t/t7900-subtree.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index 9751cfe9e6..3c87ebaf57 100755 --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -948,7 +948,7 @@ test_expect_success 'split a new subtree without --onto option' ' # also test that we still can split out an entirely new subtree # if the parent of the first commit in the tree is not empty, - # then the new subtree has accidently been attached to something + # then the new subtree has accidentally been attached to something git subtree split --prefix="sub dir2" --branch subproj2-br && check_equal "$(git log --pretty=format:%P -1 subproj2-br)" "" ) |