merge driver2

Allow the use of Git's merge driver to decrypt conflicting files and present plaintext in the conflicting merge file.