KeePass is an open-source password safe. Passwords can be stored in highly-encrypted databases, that can be unlocked with one master password or key file.
By andrewmkhoury.
September 17, 2010 at 11:00AM (PST)
This is my favorite diff merge tool. I have been using it for a long time. Only thing I can say is I wish there was a Mac and Linux version of it. KDiff3 is close, but just not the same.