Merge branch 'js/t3404-grammo-fix'

Grammofix.

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

diff --cc t/t3404-rebase-interactive.sh
index 8ac18682146008d9a5f9880628dec79daeac4090,84c3a624758e8e97f07cb0ce4c5fc8dd6ba4576b..3532c482fc5270675ccf6efe3a2d805d17a82466
--- 1/t/t3404-rebase-interactive.sh
--- 2/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@@ -43,37 -46,29 +43,37 @@@ test_expect_success 'setup' 
        test_commit G file1 &&
        test_commit H file5 &&
        git checkout -b branch2 F &&
 -      test_commit I file6
 +      test_commit I file6 &&
        git checkout -b conflict-branch A &&
 -      for n in one two three four
 -      do
 -              test_commit $n conflict
 -      done &&
 +      test_commit one conflict &&
 +      test_commit two conflict &&
 +      test_commit three conflict &&
 +      test_commit four conflict &&
        git checkout -b no-conflict-branch A &&
 -      for n in J K L M
 -      do
 -              test_commit $n file$n
 -      done &&
 +      test_commit J fileJ &&
 +      test_commit K fileK &&
 +      test_commit L fileL &&
 +      test_commit M fileM &&
        git checkout -b no-ff-branch A &&
 -      for n in N O P
 -      do
 -              test_commit $n file$n
 -      done
 +      test_commit N fileN &&
 +      test_commit O fileO &&
 +      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. Unseting SHELL avoids such non-portable behavior
 -# in tests.
 +# to create a file. Unsetting SHELL avoids such non-portable behavior
 +# in tests. It must be exported for it to take effect where needed.
  SHELL=
 +export SHELL
 +
 +test_expect_success 'rebase --keep-empty' '
 +      git checkout -b emptybranch master &&
 +      git commit --allow-empty -m "empty" &&
 +      git rebase --keep-empty -i HEAD~2 &&
 +      git log --oneline >actual &&
 +      test_line_count = 6 actual
 +'
  
  test_expect_success 'rebase -i with the exec command' '
        git checkout master &&