info here: http://git-merge.com/
info here: http://git-merge.com/