Patch ediff
Extend .gitignore