Add a Diff View #1284
Add a Diff View #1284
Conversation
|
The screencast looks nice. It might be nice also to have an option to just mark lines that have changed in the gutter. |
|
@enure that is already possible with the git bundle |
|
@koenpunt Thanks for the tip. By the way, it's actually the SCM Diff Gutter plugin. |
|
Ah, you're right, of course :) |
sorbits
force-pushed
the
master
branch
3 times, most recently
from
4234188
to
09534b7
Compare
|
This is really cool :) Any chance for a merge at some point? |
There has been too many changes to master for this to be merged. I have kept the PR open as I think some sort of native diff view would make sense, but not many specific thoughts ATM. |
|
@sorbits I have a rebased branch I could push if there is interest. |
|
its indeed nice to have this as an inbuilt feature , but for me a refined kaleidoscope integration would do as well, a final solution should work in both ways |
sorbits
force-pushed
the
master
branch
2 times, most recently
from
093e8eb
to
d2979e2
Compare
Some facts:
Enabled by menu item: View -> Diff
Uses the patience-diff algorithm, enhanced for live editing.
Unified view only for now.
Compare against Git HEAD only for now.
New appended ”layout” scopes: diff.removed.line and diff.added.line .
Stick this in your theme file to get started:
{ name = 'Diff Removed';
scope = 'diff.removed';
settings = { background = '#FFC0CB'; };
},
{ name = 'Diff Added';
scope = 'diff.added';
settings = { background = '#90EE90'; };
},
Screencast: http://www.screencast.com/t/ZQyRQPIBvu Missing +/- though.