Package | Description |
---|---|
com.jalios.io |
Contains Jalios utility I/O classes (stream pumpers, MultiInputStream
and miscellaneous utility static methods).
|
Modifier and Type | Method and Description |
---|---|
static java.util.TreeSet<SignatureDiff3Entry> |
Signature.diff3(java.io.File baseFile,
java.io.File sourceFile,
java.io.File targetFile)
Perform a diff between 3 signatures files
|
static java.util.TreeSet<SignatureDiff3Entry> |
Signature.diff3(Signature base,
Signature source,
Signature target)
Perform a diff3 between 3 signatures
|
Modifier and Type | Method and Description |
---|---|
static boolean |
Signature.diff3SetIsConflict(java.util.Set<SignatureDiff3Entry> diff3Set)
Tests whether the given diff3Set contains at least one conflict.
|
Copyright © 2001-2010 Jalios SA. All Rights Reserved.