Side-by-side diff for each conflicting change sets

[ypresto]

git mergetool creates files for each conflicting side and merge base.

Example:

• app/views/foobar.html_BASE_17711.slim
• app/views/foobar.html_LOCAL_17711.slim
• app/views/foobar.html_REMOTE_17711.slim

These files are useful to determine what was actually changed (by comparing base to local change or remote change), to resolve conflict.

There is split-diff plugin, so we only need to create above files (like mergetool) and open split diff.

[Swivelgames]

This would definitely be a huge plus. Currently I'm working with a diff that has a change of over 100 lines, which makes it difficult to process when they're top vs bottom.

[guilhermejcgois]

That is a cool feature, any news about?

[smashwilson]

👋 Thanks for taking the time to file an issue here! Unfortunately, this repository is being deprecated, so I won't be getting to this one here.

This issue still applies to the new git and GitHub package for Atom, so I've refiled this one at atom/github#816. Subscribe there for updates ✨