Hey all, I have published an initial release of https://github.com/kurtharriger/clj-mergetool that I think is reasonably usable. clj-mergetool is a git diff and merge tool for edn and clojure code to auto resolve most git conflicts