Merge branch 'js/t3404-grammo-fix' into maint

gitster · gitster · commit 8a81d5f5f81c · 2016-07-28T11:25:59.000-07:00
Grammofix.

* js/t3404-grammo-fix:
  t3404: fix a grammo (commands are ran -&gt; commands are run)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
@@ -60,7 +60,7 @@ test_expect_success 'setup' '
 	test_commit P fileP
 '
 
-# "exec" commands are ran with the user shell by default, but this may
+# "exec" commands are run with the user shell by default, but this may
 # be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work
 # to create a file. Unsetting SHELL avoids such non-portable behavior
 # in tests. It must be exported for it to take effect where needed.

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ test_expect_success 'setup' '`
`60`	`60`	`test_commit P fileP`
`61`	`61`	`'`
`62`	`62`
`63`		`-# "exec" commands are ran with the user shell by default, but this may`
	`63`	`+# "exec" commands are run with the user shell by default, but this may`
`64`	`64`	`# be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work`
`65`	`65`	`# to create a file. Unsetting SHELL avoids such non-portable behavior`
`66`	`66`	`# in tests. It must be exported for it to take effect where needed.`