Grammar fixes

Change-Id: Ibc25e999173efb3b3f04f8a4a046c9299e852b4a

git_upstream/commands/import.py

@@ -30,7 +30,7 @@ class ImportCommand(LogDedentMixin, GitUpstreamCommand):
     merges additional branches given as arguments. Current branch, unless
     overridden by the --into option, is used as the target branch from which a
     list of changes to apply onto the new import is constructed based on the
-    the specified strategy.
+    specified strategy.
 
     Once complete it will merge and replace the contents of the target branch
     with those from the import branch, unless --no-merge is specified.

git_upstream/main.py

@@ -55,8 +55,8 @@ def build_parsers():
                        help='Increase verbosity from commands, conflicts '
                             'with --quiet. May be set more than once.')
     # support logging to files as hidden options until we can hide them in
-    # normal help output, which showing them in extended help or generated
-    # manpages and documentation.
+    # normal help output, while showing them in extended help or generated
+    # man pages and documentation.
     parser.add_argument('--log-level', dest='log_level', default='notset',
                         help=argparse.SUPPRESS)
     parser.add_argument('--log-file', dest='log_file', help=argparse.SUPPRESS)

git_upstream/tests/test_strategies.py

@@ -139,7 +139,8 @@ class TestStrategies(BaseTestCase):
         upstream having been completed, test that if a change was created on
         another branch before the previous import was created, and merged to
         the target branch after the previous import, can we find it correctly.
-        i.e. will the strategy also include commit 'O' in the diagram below.
+        That is to say: will the strategy also include commit 'O' in the
+        diagram below.
 
         Repository layout being tested
 
@@ -190,8 +191,8 @@ class TestStrategies(BaseTestCase):
         upstream having been completed, test that if a change was created on
         another branch before the previous import was created, and merged to
         the target branch before the previous import was merged, can we find
-        it correctly.
-        i.e. will the strategy also include commit 'O' in the diagram below.
+        it correctly. That is to say: will the strategy also include commit
+        'O' in the diagram below.
 
         Repository layout being tested