git merge tool

welcome to shbcf.ru