Add git-crypt merge driver to support secret files merging.#107

Closed

shlomosh wants to merge 2 commits intoAGWA:masterfrom

shlomosh:master

Commits on Jan 23, 2017

Change clean method to only operate on non-encrypted files, as recommanded by git .gitattribute documentation. Add git-crypt merge driver to support secret files merging.
Shlomo Shachar
committed

Commits on Jan 25, 2017

Fix git crypt merge when multiple keys are configured.
Shlomo Shachar
committed