Class FlagConflict

  extended by com.aragost.javahg.merge.MergeFile
      extended by 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


public FlagConflict(ConflictResolvingContext mergeState,
                    String file)

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