Merge branch 'merge_tool_improving'

author Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>

Mon, 4 Jun 2012 10:48:12 +0000 (14:48 +0400)

committer Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>

Mon, 4 Jun 2012 10:48:12 +0000 (14:48 +0400)
author Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Mon, 4 Jun 2012 10:48:12 +0000 (14:48 +0400)
committer Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Mon, 4 Jun 2012 10:48:12 +0000 (14:48 +0400)
diff --cc platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
Simple merge
diff --cc platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java
Simple merge
author	Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
	Mon, 4 Jun 2012 10:48:12 +0000 (14:48 +0400)
committer	Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
	Mon, 4 Jun 2012 10:48:12 +0000 (14:48 +0400)
		1	2
platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java	patch \|	diff1 \|	diff2 \|	blob \| history