Reorganize CLI tests into tests/cli/ subdirectory

tests/test_cli_cherry_pick.py → tests/cli/test_cherry_pick.py

@@ -27,7 +27,7 @@ import tempfile
 from dulwich import porcelain
 from dulwich.cli import cmd_cherry_pick
 
-from . import TestCase
+from .. import TestCase
 
 
 class CherryPickCommandTests(TestCase):

tests/test_cli.py → tests/cli/test_cli.py

@@ -47,7 +47,7 @@ from dulwich.tests.utils import (
     build_commit_graph,
 )
 
-from . import TestCase
+from .. import TestCase
 
 
 class DulwichCliTestCase(TestCase):

tests/test_cli_merge.py → tests/cli/test_merge.py

@@ -29,7 +29,7 @@ import unittest
 from dulwich import porcelain
 from dulwich.cli import main
 
-from . import DependencyMissing, TestCase
+from .. import DependencyMissing, TestCase
 
 
 class CLIMergeTests(TestCase):