Skip to content

Support ediff and smerge modes to view diffs #39

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

Merged
ericdallo merged 10 commits into from
Sep 12, 2025
Merged

Support ediff and smerge modes to view diffs #39

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2bc247b
feat(chat): add ediff and smerge mode support
ChetanAtGNU Sep 8, 2025
ebf01b2
Merge branch 'editor-code-assistant:master' into master
ChetanKoneru Sep 8, 2025
c2d0884
Merge branch 'editor-code-assistant:master' into master
ChetanKoneru Sep 10, 2025
df0c7ae
Support edit and merge mode to view diffs
ChetanKoneru Sep 10, 2025
15f7139
Update README.md with eca-chat-diff-tool
ChetanKoneru Sep 10, 2025
c721c32
Merge branch 'editor-code-assistant:master' into master
ChetanKoneru Sep 10, 2025
249dac5
use existing frame and windows instead of creating new frames
ChetanKoneru Sep 11, 2025
626d628
Merge branch 'master' into master
ChetanKoneru Sep 11, 2025
a0d111d
Fix docstring
ericdallo Sep 12, 2025
af7e85f
Fix docstring
ericdallo Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ M-x package-install eca
- `eca-chat-window-side`: customize the chat window side.
- `eca-chat-window-width`: customize the chat window width.
- `eca-chat-window-height`: customize the chat window height.
- `eca-chat-diff-tool`: customize viewing diffs, defaults to ediff.


### Keybindings
Expand Down
Loading
Loading