Git can use an external tool for merging, so there could be eg a Clojure merge plugin even now. Apparently there are some commercial merge tools that Java programmers use for this like SemanticMerge. After all you hit the similar curly braces merge problems with other languages.