Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Add ediff and improve diff #49

Merged
merged 2 commits into from Dec 28, 2012

Conversation

Projects
None yet
3 participants
Contributor

vspinu commented Dec 28, 2012

Hi,

Ediffs are almost completely unreadable, and white non-central chunks are blinding, especially in terminal.

old

With this patch it is still not perfect, but at least readable and not dazzling anymore. It's the best I could get with default solorized colors.

old

Second commit improves the diff colors. I have removed the default diff-added, diff-changed and diff-removed annoying background.

Two reasons:

  1. With background, diffs are more difficult to read.
  2. In magit buffers, where highlighting is used to emphasize the current
    chunk, current chunk actually becomes less highlighted. During movement
    between chunks everything blinks and it is not clear where the central chunk is.

Before:
old

After:
old

vspinu added some commits Dec 28, 2012

Add ediff faces.
 The faces were completely indistinguishable, especially in terminal.
Remove diff-added, diff-changed and diff-removed annoying backgrounds.
  Two reasons:
    1) With background, diffs are more difficult to read.

    2) In magit buffers, where highlighting is used to emphasize the current
    chunk, current chunk actually becomes less highlighted. During movement
    between chunks everything blinks
Collaborator

thomasf commented Dec 28, 2012

Looks very promising!

thomasf added a commit that referenced this pull request Dec 28, 2012

Merge pull request #49 from vitoshka/ediff
Add ediff and improve diff

@thomasf thomasf merged commit 96065f6 into bbatsov:master Dec 28, 2012

Owner

bbatsov commented Dec 28, 2012

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment