Merge branch 'js/t3404-indent-fix'

gitster · gitster · commit 4438a1a59fc0 · 2019-12-16T13:14:47.000-08:00
Test cleanup.

* js/t3404-indent-fix:
  t3404: fix indentation
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
@@ -1265,11 +1265,11 @@ test_expect_success SHA1 'short SHA-1 collide' '
 	test_when_finished "reset_rebase && git checkout master" &&
 	git checkout collide &&
 	(
-	unset test_tick &&
-	test_tick &&
-	set_fake_editor &&
-	FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \
-	FAKE_LINES="reword 1 2" git rebase -i HEAD~2
+		unset test_tick &&
+		test_tick &&
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \
+		FAKE_LINES="reword 1 2" git rebase -i HEAD~2
 	)
 '
 

Original file line number	Diff line number	Diff line change
`@@ -1265,11 +1265,11 @@ test_expect_success SHA1 'short SHA-1 collide' '`
`1265`	`1265`	`test_when_finished "reset_rebase && git checkout master" &&`
`1266`	`1266`	`git checkout collide &&`
`1267`	`1267`	`(`
`1268`		`- unset test_tick &&`
`1269`		`- test_tick &&`
`1270`		`- set_fake_editor &&`
`1271`		`- FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \`
`1272`		`- FAKE_LINES="reword 1 2" git rebase -i HEAD~2`
	`1268`	`+ unset test_tick &&`
	`1269`	`+ test_tick &&`
	`1270`	`+ set_fake_editor &&`
	`1271`	`+ FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \`
	`1272`	`+ FAKE_LINES="reword 1 2" git rebase -i HEAD~2`
`1273`	`1273`	`)`
`1274`	`1274`	`'`
`1275`	`1275`