|
Last change
on this file since 1650 was 1650, checked in by Gubaer, 15 years ago |
|
added concept of "merge pairs" (my vs. merged, my vs. their, their vs. merged)
added highlighting of conflicts with colors
now displays number of entries for lists
fixed bugs
|
|
File size:
258 bytes
|
| Line | |
|---|
| 1 | // License: GPL. For details, see LICENSE file.
|
|---|
| 2 | package org.openstreetmap.josm.gui.conflict;
|
|---|
| 3 |
|
|---|
| 4 | /**
|
|---|
| 5 | * Enumeration of roles entry lists play in {@see ListMergeModel}
|
|---|
| 6 | */
|
|---|
| 7 | public enum ListRole {
|
|---|
| 8 | MY_ENTRIES,
|
|---|
| 9 | MERGED_ENTRIES,
|
|---|
| 10 | THEIR_ENTRIES
|
|---|
| 11 | }
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
