1 package com.aragost.javahg.merge;
2
3 /**
4 * Represent a file where merge gave a flag conflict.
5 * <p>
6 * Current JavaHg does not provide any API to manipulate this merge.
7 * It is merge with the default settings (i.e. no flags)
8 */
9 public class FlagConflict extends MergeFile {
10
11 public FlagConflict(ConflictResolvingContext mergeState, String file) {
12 super(mergeState, file);
13 }
14 }