package com.microsoft.alm.plugin.external.models;
public class MergeConflict extends RenameConflict {
private final MergeMapping mapping;
public MergeConflict(final String localPath, final MergeMapping mapping) {
<BUG>super(localPath, mapping.getToServerItem(), mapping.getFromServerItem(), ConflictType.MERGE);
</BUG>
this.mapping = mapping;
}
public MergeMapping getMapping() {

package com.microsoft.alm.plugin.external.models;
public class MergeConflict extends RenameConflict {
private final MergeMapping mapping;
public MergeConflict(final String localPath, final MergeMapping mapping) {
super(localPath, mapping.getFromServerItem(), mapping.getToServerItem(), ConflictType.MERGE);
this.mapping = mapping;
}
public MergeMapping getMapping() {
