C# Class Versionr.Utilities.DiffTool

ファイルを表示 Open project: eatplayhate/versionr

Public Methods

Method	Description
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

Method Details

Diff() public static method

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
return	System.Diagnostics.Process

Diff() public static method

public static Diff ( string baseFile, string file, string externalTool ) : void
baseFile	string
file	string
externalTool	string
return	void

GetTempFilename() public static method

public static GetTempFilename ( ) : string
return	string

Merge() public static method

public static Merge ( string baseFile, string file, string output, string externalTool ) : bool
baseFile	string
file	string
output	string
externalTool	string
return	bool

Merge() public static method

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
return	bool

Merge3Way() public static method

public static Merge3Way ( string baseFile, string file1, string file2, string output, string externalTool ) : bool
baseFile	string
file1	string
file2	string
output	string
externalTool	string
return	bool

Merge3Way() public static method

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
return	bool