ToolsAPI.IOTACustomMergeViewer.ShowMerge
Delphi
procedure ShowMerge(const Base, Theirs, Mine: IStream; const BaseDisplayName,
TheirsDisplayName, MineDisplayName, FileName, BaseFileName, TheirsFileName,
MineFileName: string; Wait: Boolean);
C++
virtual void __fastcall ShowMerge(const _di_IStream Base, const _di_IStream Theirs, const _di_IStream Mine, const System::UnicodeString BaseDisplayName, const System::UnicodeString TheirsDisplayName, const System::UnicodeString MineDisplayName, const System::UnicodeString FileName, const System::UnicodeString BaseFileName, const System::UnicodeString TheirsFileName, const System::UnicodeString MineFileName, bool Wait) = 0 ;
Properties
Type | Visibility | Source | Unit | Parent |
---|---|---|---|---|
procedure function |
public | ToolsAPI.pas ToolsAPI.hpp |
ToolsAPI | IOTACustomMergeViewer |
Description
Embarcadero Technologies does not currently have any additional information.