-- Make an awesome wizard subcommand that you can point at a file that is DOS
- when the source wants it to be UNIX, or the other way around, and it will
- redo the merge on that file correctly. Alternatively, just make wizard
- sufficiently awesome to detect line-ending mismatch and fix it w/o any
- prompting.
-- Use diff3 conflictstyle