elasticdog / transcrypt

transparently encrypt files within a git repository
MIT License
1.46k stars 102 forks source link

Fix for newly-introduced bug in merge driver #87

Closed jmurty closed 4 years ago

jmurty commented 4 years ago

This PR is already manually merged to master