Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement threeway diffs #33

Open
albfan opened this issue Jan 23, 2016 · 1 comment
Open

Implement threeway diffs #33

albfan opened this issue Jan 23, 2016 · 1 comment
Labels
ready

Comments

@albfan
Copy link
Owner

albfan commented Jan 23, 2016

Just add another buffer and compare
@albfan albfan added the ready label Jan 23, 2016
@albfan
Copy link
Owner Author

albfan commented Mar 31, 2017

Allow a merge conflict resolution, where both sides don't have to be equal to center, but differences are deactivated when conflict is resolved, that way you can always check result and origin

Needs local file, remote file, base file, result file and allow to compare each one with others at any time

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
ready
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@albfan