mergiraf 0.18.0

A syntax-aware merge driver for Git
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
# Summary

- [Introduction]./introduction.md
- [Installation]./installation.md
- [Usage]./usage.md
- [Conflicts solved, limitations]./conflicts.md
- [Supported languages]./languages.md
- [Adding a new language]./adding-a-language.md
   - [Commutative merging]./adding-a-language/enabling-commutative-merging.md
   - [Advanced configuration]./adding-a-language/advanced-configuration.md
   - [Testing]./adding-a-language/testing.md
- [Architecture]./architecture.md
- [Related work]./related-work.md