Thanks for pointing out `pass`!<p>I&#x27;ve been manually merging a set of Password-Safe-format password files (one for each of my many computers) and I&#x27;ve been thinking about alternatives for a long while. I was actually thinking about how I could combine encrypted files with Git to get history and painless merging – I&#x27;m glad to know that someone else had the same ideas!