ediff is almost working as a git diff/merge tool