|
@@ -5,7 +5,7 @@ from typing import Optional
|
|
|
try:
|
|
try:
|
|
|
import merge3
|
|
import merge3
|
|
|
except ImportError:
|
|
except ImportError:
|
|
|
- merge3 = None
|
|
|
|
|
|
|
+ merge3 = None # type: ignore
|
|
|
|
|
|
|
|
from dulwich.attrs import GitAttributes
|
|
from dulwich.attrs import GitAttributes
|
|
|
from dulwich.config import Config
|
|
from dulwich.config import Config
|