mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Documentation: Fix misspellings
This commit is contained in:
Junio C Hamano
2012-06-22 14:35:51 -07:00
parent fd378070c8 8d8136c37a
commit f71be5cc06
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t4253-am-keep-cr-dos.sh
View File

@ -62,7 +62,7 @@ test_expect_success 'am with dos files config am.keepcr' '
git diff --exit-code master
'
test_expect_success 'am with dos files config am.keepcr overriden by --no-keep-cr' '
test_expect_success 'am with dos files config am.keepcr overridden by --no-keep-cr' '
git config am.keepcr 1 &&
git checkout -b dosfiles-conf-keepcr-override initial &&
git format-patch -k initial..master &&
@ -83,7 +83,7 @@ test_expect_success 'am with dos files with --keep-cr continue' '
git diff --exit-code master
'
test_expect_success 'am with unix files config am.keepcr overriden by --no-keep-cr' '
test_expect_success 'am with unix files config am.keepcr overridden by --no-keep-cr' '
git config am.keepcr 1 &&
git checkout -b unixfiles-conf-keepcr-override initial &&
cp -f file1 file &&

2
t/t9300-fast-import.sh
View File

@ -2117,7 +2117,7 @@ test_expect_success \
grep :1 git.marks'
test_expect_success \
'R: export-marks options can be overriden by commandline options' \
'R: export-marks options can be overridden by commandline options' \
'cat input | git fast-import --export-marks=other.marks &&
grep :1 other.marks'