Merge improvements

- [x] Perform merge simplification to remove non-conflicts (identically changed ours/theirs)
- [x] Do not attempt to write merge files from binary inputs
- [ ] Allow merge file type configurability (eg `--diff3`)
- [ ] Respect configuration settings for diff3