Метод | Описание | |
---|---|---|
Diff ( string baseFile, string baseAlias, string file, string fileAlias, string externalTool, bool nonblocking ) : System.Diagnostics.Process | ||
Diff ( string baseFile, string file, string externalTool ) : void | ||
GetTempFilename ( ) : string | ||
Merge ( string baseFile, string file, string output, string externalTool ) : bool | ||
Merge ( string baseFile, string baseAlias, string file, string fileAlias, string output, string externalTool ) : bool | ||
Merge3Way ( string baseFile, string file1, string file2, string output, string externalTool ) : bool | ||
Merge3Way ( string baseFile, string baseAlias, string file1, string file1Alias, string file2, string file2Alias, string output, string externalTool ) : bool |
public static Diff ( string baseFile, string baseAlias, string file, string fileAlias, string externalTool, bool nonblocking ) : System.Diagnostics.Process | ||
baseFile | string | |
baseAlias | string | |
file | string | |
fileAlias | string | |
externalTool | string | |
nonblocking | bool | |
Результат | System.Diagnostics.Process |
public static Diff ( string baseFile, string file, string externalTool ) : void | ||
baseFile | string | |
file | string | |
externalTool | string | |
Результат | void |
public static GetTempFilename ( ) : string | ||
Результат | string |
public static Merge ( string baseFile, string file, string output, string externalTool ) : bool | ||
baseFile | string | |
file | string | |
output | string | |
externalTool | string | |
Результат | bool |
public static Merge ( string baseFile, string baseAlias, string file, string fileAlias, string output, string externalTool ) : bool | ||
baseFile | string | |
baseAlias | string | |
file | string | |
fileAlias | string | |
output | string | |
externalTool | string | |
Результат | bool |
public static Merge3Way ( string baseFile, string file1, string file2, string output, string externalTool ) : bool | ||
baseFile | string | |
file1 | string | |
file2 | string | |
output | string | |
externalTool | string | |
Результат | bool |
public static Merge3Way ( string baseFile, string baseAlias, string file1, string file1Alias, string file2, string file2Alias, string output, string externalTool ) : bool | ||
baseFile | string | |
baseAlias | string | |
file1 | string | |
file1Alias | string | |
file2 | string | |
file2Alias | string | |
output | string | |
externalTool | string | |
Результат | bool |