merge actions are dumb-aware (IDEADEV-41042)
commit2f6f567143ca64d1ddcdd0bc382ff3c42334ccf0
authorDmitry Jemerov <yole@jetbrains.com>
Tue, 27 Oct 2009 16:03:18 +0000 (27 19:03 +0300)
committerDmitry Jemerov <yole@jetbrains.com>
Tue, 27 Oct 2009 16:04:02 +0000 (27 19:04 +0300)
tree67701605683c5359efae555d18a393c9cc03acd8
parentbf3e5a7cffe764204a9f6fa51d3f898c4760f1a5
merge actions are dumb-aware (IDEADEV-41042)
platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/ApplyNonConflicts.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/OpenPartialDiffAction.java