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

Support smerge #1

Open
dakra opened this issue Oct 13, 2018 · 1 comment
Open

Support smerge #1

dakra opened this issue Oct 13, 2018 · 1 comment

Comments

@dakra
Copy link

dakra commented Oct 13, 2018

I like smerge better than ediff as it's easier and most of the time enough.
Magit has smerge as default as well.
@UndeadKernel
Copy link
Owner

I'm not familiar with smerge but it might be a simple feature to implement.
I'll try to experiment with it to see how it works.
Ediff is a monsert, but once you learn to use it (and understand it's delicate feelings) it's powerful.

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

No branches or pull requests
2 participants
@dakra @UndeadKernel