hudson.plugins.jigomerge

Class MergeResult

java.lang.Object

hudson.plugins.jigomerge.MergeResult

public class MergeResult
extends Object

Constructor Summary

Constructors

Constructor and Description
MergeResult()

Method Summary

Methods

Modifier and Type	Method and Description
Map<String,List<String>>	getConflictingDiffs()
Map<String,List<String>>	getConflictingFiles()
Map<String,String>	getConflictingLogs()
List<String>	getConflictingRevisions()
boolean	isStatus()
void	setStatus(boolean status)

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

MergeResult

public MergeResult()

Method Detail

isStatus

public boolean isStatus()

setStatus

public void setStatus(boolean status)

getConflictingRevisions

public List<String> getConflictingRevisions()

getConflictingLogs

public Map<String,String> getConflictingLogs()

getConflictingFiles

public Map<String,List<String>> getConflictingFiles()

getConflictingDiffs

public Map<String,List<String>> getConflictingDiffs()