source: josm/trunk/src/org/openstreetmap/josm/command/conflict @ 8910

Name Size Rev Age Author Last Change
../
package-info.java 151 bytes 7937   7 years bastiK add subversion property svn:eol=native
ModifiedConflictResolveCommand.java 2.8 KB 8910   6 years Don-vip add unit test for ConflictAddCommand
VersionConflictResolveCommand.java 3.1 KB 8910   6 years Don-vip add unit test for ConflictAddCommand
CoordinateConflictResolveCommand.java 3.2 KB 8910   6 years Don-vip add unit test for ConflictAddCommand
WayNodesConflictResolverCommand.java 3.3 KB 8910   6 years Don-vip add unit test for ConflictAddCommand
ConflictResolveCommand.java 3.3 KB 8910   6 years Don-vip add unit test for ConflictAddCommand
ConflictAddCommand.java 3.5 KB 8910   6 years Don-vip add unit test for ConflictAddCommand
DeletedStateConflictResolveCommand.java 3.8 KB 8910   6 years Don-vip add unit test for ConflictAddCommand
RelationMemberConflictResolverCommand.java 4.0 KB 8510   6 years Don-vip checkstyle: enable relevant whitespace checks and fix them
TagConflictResolveCommand.java 4.5 KB 8910   6 years Don-vip add unit test for ConflictAddCommand
Note: See TracBrowser for help on using the repository browser.