Public Git Hosting - EMFCompare2.git/commit

commit	8ecb357104a1c73d47a32e9e9ddc26c30150720b
author	Axel Richard <axel.richard@obeo.fr>
	Fri, 4 Oct 2013 14:50:27 +0000 (4 16:50 +0200)
committer	Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
	Fri, 18 Oct 2013 08:45:25 +0000 (18 04:45 -0400)
tree	71eecfb690fd9ab53c7ebb2fbd824a0f43ef4a2c	tree \| snapshot (tar.gz zip)
parent	fb7a6a919ae3bdf0680f2a44de4863ed2caabd12	commit \| diff

[406402] - Fix conflicts are created after merging and saving

Bug: 406402
Change-Id: I14810620cc82fdc6317995f6019514c0c77b7a4e

plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/NodeMergeTest.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/ConflictDetectionTest.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/ConflictInputData.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/j/conflict_j_left.nodes	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/j/conflict_j_origin.nodes	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/j/conflict_j_right.nodes	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/conflict/DefaultConflictDetector.java		diff \| blob \| blame \| history

Eclipse foundation framework to comapre EMF models