search

alvawei / smerge

3 stars 3 forks source link

Error using smerge as git mergetool with Kotlin files #7

Open erawhctim opened 5 years ago

erawhctim commented 5 years ago 
Exception in thread "main" java.lang.IllegalArgumentException: Parsing is not supported for this file type: app/src/main/java/com/chickfila/cfaflagship/service/FavoriteOrderServiceImpl.kt
    at smerge.parsers.Parser.getInstance(Parser.java:24)
    at smerge.Merger.main(Merger.java:34)

Can additional file types be added easily? Happy to help with this if you want to provide some lightweight steps/README docs on how to do so.