This is pretty great. Stow (plus git) is how I'm managing the config files for multiple hosts in my respective home dirs, and the conflict resolution switches are going to be a huge help.