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

Add support for merges #70

Open
danvk opened this issue Nov 16, 2014 · 1 comment
Open

Add support for merges #70

danvk opened this issue Nov 16, 2014 · 1 comment
Labels
git

Comments

@danvk
Copy link
Owner

danvk commented Nov 16, 2014

The git UI for merges is confusing:

<<<blah
blah
======
blah
>>>blah

It would be nice if webdiff could show the three-way merge.
@ryan-williams
Copy link
Contributor

+1

@danvk danvk added the git label Dec 12, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
git
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@danvk @ryan-williams