@@ -463,8 +463,8 @@ def unmerged_blobs(self):
         for stage, blob in self.iter_blobs(is_unmerged_blob):
             path_map.setdefault(blob.path, []).append((stage, blob))
         # END for each unmerged blob
-        for l in path_map.values():
-            l.sort()
+        for line in path_map.values():
+            line.sort()
         return path_map
 
     @classmethod
 
@@ -466,7 +466,7 @@ def delete(cls, repo, path):
                     # write-binary is required, otherwise windows will
                     # open the file in text mode and change LF to CRLF !
                     with open(pack_file_path, 'wb') as fd:
-                        fd.writelines(l.encode(defenc) for l in new_lines)
+                        fd.writelines(line.encode(defenc) for line in new_lines)
 
             except (OSError, IOError):
                 pass  # it didn't exist at all
 
@@ -686,7 +686,7 @@ def _get_fetch_info_from_stderr(self, proc, progress):
 
         # read head information
         with open(osp.join(self.repo.common_dir, 'FETCH_HEAD'), 'rb') as fp:
-            fetch_head_info = [l.decode(defenc) for l in fp.readlines()]
+            fetch_head_info = [line.decode(defenc) for line in fp.readlines()]
 
         l_fil = len(fetch_info_lines)
         l_fhi = len(fetch_head_info)
 
@@ -212,7 +212,7 @@ def test_index_file_from_tree(self, rw_repo):
         assert unmerged_blob_map
 
         # pick the first blob at the first stage we find and use it as resolved version
-        three_way_index.resolve_blobs(l[0][1] for l in unmerged_blob_map.values())
+        three_way_index.resolve_blobs(line[0][1] for line in unmerged_blob_map.values())
         tree = three_way_index.write_tree()
         assert isinstance(tree, Tree)
         num_blobs = 0