From 7bb53f4779111685eced0e4a8d5a0446f7bf691b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Wed, 7 Oct 2026 03:39:03 -0400 Subject: [PATCH] =?UTF-8?q?Git=20=C2=B7=20export=20MARKER?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/git/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/git/mod.rs b/src/git/mod.rs index 9fc1339..37ef3c9 100644 --- a/src/git/mod.rs +++ b/src/git/mod.rs @@ -26,7 +26,7 @@ pub use graph::{GraphRow, Half, Stroke, lanes}; pub use history::FileHistory; pub use merge::{ConflictResolver, ThreeWayMerge}; pub use merging::{ - Conflict, Region, RegionKind, Take, conflicts, marked, regions, resolve, result, + Conflict, MARKER, Region, RegionKind, Take, conflicts, marked, regions, resolve, result, }; pub use refs::{Branch, BranchList, BranchSelector}; pub use review::{PullRequest, PullRequestCard, PullState, ReviewComment, ReviewNote};