com.aragost.javahg.merge
Class FlagConflict

java.lang.Object
  com.aragost.javahg.merge.MergeFile
      com.aragost.javahg.merge.FlagConflict

public class FlagConflict
extends MergeFile

Represent a file where merge gave a flag conflict.

Current JavaHg does not provide any API to manipulate this merge. It is merge with the default settings (i.e. no flags)

Constructor Summary

FlagConflict(ConflictResolvingContext mergeState, String file)

Method Summary

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

FlagConflict

public FlagConflict(ConflictResolvingContext mergeState,
                    String file)