Add line ending rules.
Change merge tool to gvimdiff.