├── .gitattributes ├── .github └── workflows │ ├── build.yml │ └── changelog.yml ├── .gitignore ├── .ocamlformat ├── CHANGES.md ├── LICENSE ├── Makefile ├── README.md ├── dune ├── dune-project ├── merge-fmt-help.txt ├── merge-fmt-mergetool-help.txt ├── merge-fmt-setup-merge-help.txt ├── merge-fmt-setup-mergetool-help.txt ├── merge-fmt.opam ├── src ├── common.ml ├── dune ├── fmters.ml ├── fmters.mli ├── merge_cmd.ml ├── merge_cmd.mli ├── merge_fmt.ml ├── merge_fmt.mli ├── resolve_cmd.ml ├── resolve_cmd.mli ├── setup_cmd.ml └── setup_cmd.mli └── test ├── common.ml ├── dune ├── merge.ml ├── merge_dune.ml ├── mergetool.ml ├── partial.ml ├── rebase.diff ├── rebase_a.ml ├── rebase_b.ml ├── resolve1.ml └── resolve2.ml /.gitattributes: -------------------------------------------------------------------------------- 1 | * text=auto 2 | -------------------------------------------------------------------------------- /.github/workflows/build.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/.github/workflows/build.yml -------------------------------------------------------------------------------- /.github/workflows/changelog.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/.github/workflows/changelog.yml -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/.gitignore -------------------------------------------------------------------------------- /.ocamlformat: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/.ocamlformat -------------------------------------------------------------------------------- /CHANGES.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/CHANGES.md -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/LICENSE -------------------------------------------------------------------------------- /Makefile: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/Makefile -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/README.md -------------------------------------------------------------------------------- /dune: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/dune -------------------------------------------------------------------------------- /dune-project: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/dune-project -------------------------------------------------------------------------------- /merge-fmt-help.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/merge-fmt-help.txt -------------------------------------------------------------------------------- /merge-fmt-mergetool-help.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/merge-fmt-mergetool-help.txt -------------------------------------------------------------------------------- /merge-fmt-setup-merge-help.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/merge-fmt-setup-merge-help.txt -------------------------------------------------------------------------------- /merge-fmt-setup-mergetool-help.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/merge-fmt-setup-mergetool-help.txt -------------------------------------------------------------------------------- /merge-fmt.opam: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/merge-fmt.opam -------------------------------------------------------------------------------- /src/common.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/src/common.ml -------------------------------------------------------------------------------- /src/dune: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/src/dune -------------------------------------------------------------------------------- /src/fmters.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/src/fmters.ml -------------------------------------------------------------------------------- /src/fmters.mli: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/src/fmters.mli -------------------------------------------------------------------------------- /src/merge_cmd.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/src/merge_cmd.ml -------------------------------------------------------------------------------- /src/merge_cmd.mli: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/src/merge_cmd.mli -------------------------------------------------------------------------------- /src/merge_fmt.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/src/merge_fmt.ml -------------------------------------------------------------------------------- /src/merge_fmt.mli: -------------------------------------------------------------------------------- 1 | (* empty *) 2 | -------------------------------------------------------------------------------- /src/resolve_cmd.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/src/resolve_cmd.ml -------------------------------------------------------------------------------- /src/resolve_cmd.mli: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/src/resolve_cmd.mli -------------------------------------------------------------------------------- /src/setup_cmd.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/src/setup_cmd.ml -------------------------------------------------------------------------------- /src/setup_cmd.mli: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/src/setup_cmd.mli -------------------------------------------------------------------------------- /test/common.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/test/common.ml -------------------------------------------------------------------------------- /test/dune: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/test/dune -------------------------------------------------------------------------------- /test/merge.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/test/merge.ml -------------------------------------------------------------------------------- /test/merge_dune.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/test/merge_dune.ml -------------------------------------------------------------------------------- /test/mergetool.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/test/mergetool.ml -------------------------------------------------------------------------------- /test/partial.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/test/partial.ml -------------------------------------------------------------------------------- /test/rebase.diff: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/test/rebase.diff -------------------------------------------------------------------------------- /test/rebase_a.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/test/rebase_a.ml -------------------------------------------------------------------------------- /test/rebase_b.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/test/rebase_b.ml -------------------------------------------------------------------------------- /test/resolve1.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/test/resolve1.ml -------------------------------------------------------------------------------- /test/resolve2.ml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/hhugo/merge-fmt/HEAD/test/resolve2.ml --------------------------------------------------------------------------------