Summary
- add mergiraf syntax aware merger for git (commit: e16fca6) (details)
The file was added | components/developer/mergiraf/Makefile |
The file was added | components/developer/mergiraf/manifests/sample-manifest.p5m |
The file was added | components/developer/mergiraf/test/results-all.master |
The file was added | components/developer/mergiraf/mergiraf.p5m |
The file was added | components/developer/mergiraf/pkg5 |