@hackage / confsolve

A command line tool for resolving conflicts of file synchronizers.