This commit is contained in:
LZX committed 2026-09-23 15:17:14 +08:00
1 parent a8b7bdf606
commit 3faf9a7ae5
82 files changed
+3041 -883

No files matched your search

+12
View File
@@ -68,6 +68,18 @@ class ConflictLine {
role == ConflictLineRole.oursContent ||
role == ConflictLineRole.baseContent ||
role == ConflictLineRole.theirsContent;
bool get isOurs =>
role == ConflictLineRole.oursHeader ||
role == ConflictLineRole.oursContent;
bool get isTheirs =>
role == ConflictLineRole.theirsHeader ||
role == ConflictLineRole.theirsContent;
bool get isBase =>
role == ConflictLineRole.baseHeader ||
role == ConflictLineRole.baseContent;
}
/// 把冲突文件内容摊平成可渲染的行序列