Investigate resolving merge conflicts for encrypted files

[elasticdog]

Note to self, I need to better understand the failure/recovery scenario when there is a merge conflict happening with an encrypted file.

[elasticdog]

This is relevant to the discussion in #23, but essentially it's not a super nice situation. If there's a merge conflict, the inline markers will only show the encrypted text, although if you look at a diff you'll see a combination of the plaintext changes and the encrypted diff.

The easiest way to resolve things is by using git checkout --ours <file> or git checkout --theirs <file> to get the different desired plaintext and then editing manually. Not ideal, but I get why it works that way when you're essentially dealing with binary files.