com.aragost.javahg.merge
Class MergeConflict

java.lang.Object
  extended by com.aragost.javahg.merge.MergeFile
      extended by com.aragost.javahg.merge.MergeConflict

public class MergeConflict
extends MergeFile


Constructor Summary
MergeConflict(ConflictResolvingContext mergeState, String file)
           
 
Method Summary
 boolean isResolved()
           
 void markResolved()
          Mark this merge conflict as resolved
 boolean resolveWith(String tool)
          Attempt to resolve conflict with the specified tool.
 boolean resolveWithInternalMerge()
          Attempt to resolve conflict with Mercurial's internal merge tool
 
Methods inherited from class com.aragost.javahg.merge.MergeFile
getFile, getFilename, getMergeCtx, toString
 
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
 

Constructor Detail

MergeConflict

public MergeConflict(ConflictResolvingContext mergeState,
                     String file)
Method Detail

isResolved

public boolean isResolved()

resolveWithInternalMerge

public boolean resolveWithInternalMerge()
Attempt to resolve conflict with Mercurial's internal merge tool

Returns:
true if the conflict was resolved, false otherwise

resolveWith

public boolean resolveWith(String tool)
Attempt to resolve conflict with the specified tool.

Returns:
true if the conflict was resolved, false otherwise

markResolved

public void markResolved()
Mark this merge conflict as resolved



Copyright © 2011-2013 aragost Trifork ag. All Rights Reserved.