com.aragost.javahg.merge
Class MergeConflict
java.lang.Object
com.aragost.javahg.merge.MergeFile
com.aragost.javahg.merge.MergeConflict
public class MergeConflict
- extends MergeFile
MergeConflict
public MergeConflict(ConflictResolvingContext mergeState,
String file)
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.