Open scf1984 opened 9 months ago
This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.
This isn't in our recent plan yet, 3-way merge is a good feature but we lack of times to implement that
IntelliJ have three-column view that allows fixing conflicts by choosing edits from left/right. What would it take to create something like that with this package?