Merge branch 'js/t3404-typofix' into jch

gitster · gitster · commit cfab3cfa80b9 · 2019-06-21T15:00:34.000-07:00
Typofix.

* js/t3404-typofix:
  t3404: fix a typo
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
@@ -1031,7 +1031,7 @@ test_expect_success 'rebase -i --root reword root commit' '
 	test -z "$(git show -s --format=%p HEAD^)"
 '
 
-test_expect_success 'rebase -i --root when root has untracked file confilct' '
+test_expect_success 'rebase -i --root when root has untracked file conflict' '
 	test_when_finished "reset_rebase" &&
 	git checkout -b failing-root-pick A &&
 	echo x >file2 &&

Original file line number	Diff line number	Diff line change
`@@ -1031,7 +1031,7 @@ test_expect_success 'rebase -i --root reword root commit' '`
`1031`	`1031`	`test -z "$(git show -s --format=%p HEAD^)"`
`1032`	`1032`	`'`
`1033`	`1033`
`1034`		`-test_expect_success 'rebase -i --root when root has untracked file confilct' '`
	`1034`	`+test_expect_success 'rebase -i --root when root has untracked file conflict' '`
`1035`	`1035`	`test_when_finished "reset_rebase" &&`
`1036`	`1036`	`git checkout -b failing-root-pick A &&`
`1037`	`1037`	`echo x >file2 &&`