git4idea: Made merge provider to use MergeProvider2, refactored some utlities that...
tree47f5e471ad37da1ff1ee79f740233903663c0fa8
drwxr-xr-x - RegExpSupport
drwxr-xr-x - plugins