#
# ChangeLog for trunk/test/unit/org/openstreetmap/josm/command in josm
#
# Generated by Trac 1.6
# 2024-04-24T17:00:02+02:00

Tue, 20 Oct 2015 14:05:10 GMT Don-vip [8917]
	* trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java (modified)

	fix unit tests


Mon, 19 Oct 2015 23:22:27 GMT Don-vip [8916]
	* trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java (modified)

	fix unit tests


Mon, 19 Oct 2015 21:49:11 GMT Don-vip [8914]
	* trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java (added)

	improve unit tests


Mon, 19 Oct 2015 18:25:49 GMT Don-vip [8910]
	* trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/command (added)
	* trunk/test/unit/org/openstreetmap/josm/command/conflict (added)
	* trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java (added)

	add unit test for `ConflictAddCommand`