10 Commits

Author	SHA1	Message	Date
anna	ad87ed290e	move as enum: strip enum qualifiers in case statements	2010-06-09 17:32:57 +04:00
anna	24c6e0bfa5	move inner to interface: strip static modifier	2010-02-11 17:56:26 +03:00
anna	5d869f823b	cleanup: replace unnamed RuntimeException with dedicated ConflictException	2009-10-28 14:07:51 +03:00
anna	3973debce5	show conflicts unification; ... encapsulate fields: rise conflicts; tests	2009-10-27 12:23:55 +03:00
anna	a9a8372082	move static members with static non-demand imports to preseve non-demand (IDEADEV-40862)	2009-10-19 21:31:57 +04:00
anna	b893d8bf73	multiple conflicts per element	2009-10-05 18:21:31 +04:00
Anna Kozlova	39f93426e2	move members: show conflict if non-final field is moved to interface	2009-09-17 21:10:31 +04:00
Dmitry Jemerov	60cee678a2	correct fix for case of testdata	2009-09-11 23:01:18 +04:00
Dmitry Jemerov	bd9ea92e84	fix case of files in testdata	2009-09-11 22:49:35 +04:00
Dmitry Jemerov	f3d10757e9	test++	2009-09-11 16:24:07 +04:00