Note that supporting new code formatters is trivial.
Getting starting
There are two ways to use merge-fmt.
Standalone
Just call merge-fmt while there are unresolved conflicts. merge-fmt will try resolve conflicts automatically.
As a Git mergetool
merge-fmt can act as a git mergetool. First configure the current git repository with merge-fmt mergetool-setup --update Then, use git mergetool to resolve conflicts with git mergetool -t mergefmt