Git · export MARKER
This commit is contained in:
1 file changed
+1
-1
+1
-1
@@ -26,7 +26,7 @@ pub use graph::{GraphRow, Half, Stroke, lanes};
|
|||||||
pub use history::FileHistory;
|
pub use history::FileHistory;
|
||||||
pub use merge::{ConflictResolver, ThreeWayMerge};
|
pub use merge::{ConflictResolver, ThreeWayMerge};
|
||||||
pub use merging::{
|
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 refs::{Branch, BranchList, BranchSelector};
|
||||||
pub use review::{PullRequest, PullRequestCard, PullState, ReviewComment, ReviewNote};
|
pub use review::{PullRequest, PullRequestCard, PullState, ReviewComment, ReviewNote};
|
||||||
|
|||||||
Reference in new issue
Block a user