-
Notifications
You must be signed in to change notification settings - Fork 29
Open
Description
Hi! Thanks for this awesome project! Are there any plans to add support for jujutsu VCS?
It has slightly different conflict markers :
<<<<<<< conflict 1 of 1
%%%%%%% diff from: vpxusssl 38d49363 "merge base"
\\\\\\\ to: rtsqusxu 2768b0b9 "commit A"
apple
-grape
+grapefruit
orange
+++++++ ysrnknol 7a20f389 "commit B"
APPLE
GRAPE
ORANGE
>>>>>>> conflict 1 of 1 ends
Reactions are currently unavailable
Metadata
Metadata
Assignees
Labels
No labels