When merging conflict, use ediff handling of merged file
When solving conflict, ask ediff to look only at conflicting part of files