git4idea: Made merge provider to use MergeProvider2, refactored some utlities that...