Ivan.Shakhovandintellij-monorepo-bot 29b1e3ef39 IDEA-CR-1477: extension point for External Merge tool provided by plugin, see RIDER-33411 UnityYAMLMerge support ...

(cherry picked from commit 3c8551d52b365fecfac886e2d031ec5b038fd402)

GitOrigin-RevId: d005b1f0a582d6dd70c6903557a3b8ce2b11c0d4

2020-05-14 15:24:13 +00:00

..

resources/messages

Remove dependency intellij.platform.diff.impl -> intellij.platform.vcs, IDEA-CR-1366

2020-04-28 19:16:33 +00:00

src

IDEA-CR-1477: extension point for External Merge tool provided by plugin, see RIDER-33411 UnityYAMLMerge support

2020-05-14 15:24:13 +00:00

intellij.platform.diff.iml

…