Working Diff plus bash script used for reporting merge status when merging files
Merge branch 'master' of https://github.com/StanGanin/Diff