From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Jul 2016 18:25:58 +0000 (-0700)
Subject: Merge branch 'js/t3404-grammo-fix' into maint
X-Git-Tag: v2.9.3~52
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8a81d5f5f81c8e42927b4361bc93ddfc345393b7?hp=dcfb9d7d30720f50c6e66a85d5a96edc3151e9bf

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

Grammofix.

* js/t3404-grammo-fix:
t3404: fix a grammo (commands are ran -> commands are run)
---

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 66348f11d1..c7ea8bacf4 100755
--- 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.