| Method |
Description |
|
|
ConflictedFilesContextMenu_Opening ( object sender, CancelEventArgs e ) : void |
|
|
|
ConflictedFiles_CellMouseDown ( object sender, System.Windows.Forms.DataGridViewCellMouseEventArgs e ) : void |
|
|
|
ConflictedFiles_DoubleClick ( object sender, EventArgs e ) : void |
|
|
|
ConflictedFiles_SelectionChanged ( object sender, EventArgs e ) : void |
|
|
|
ContextChooseBase_Click ( object sender, EventArgs e ) : void |
|
|
|
ContextChooseLocal_Click ( object sender, EventArgs e ) : void |
|
|
|
ContextChooseRemote_Click ( object sender, EventArgs e ) : void |
|
|
|
ContextMarkAsSolved_Click ( object sender, EventArgs e ) : void |
|
|
|
ContextOpenBaseWith_Click ( object sender, EventArgs e ) : void |
|
|
|
ContextOpenLocalWith_Click ( object sender, EventArgs e ) : void |
|
|
|
ContextOpenRemoteWith_Click ( object sender, EventArgs e ) : void |
|
|
|
ContextSaveBaseAs_Click ( object sender, EventArgs e ) : void |
|
|
|
ContextSaveLocalAs_Click ( object sender, EventArgs e ) : void |
|
|
|
ContextSaveRemoteAs_Click ( object sender, EventArgs e ) : void |
|
|
|
FormResolveConflicts_FormClosing ( object sender, FormClosingEventArgs e ) : void |
|
|
|
FormResolveConflicts_Load ( object sender, EventArgs e ) : void |
|
|
|
GetFileName ( ) : string |
|
|
|
GetShortFileName ( string fileName ) : string |
|
|
|
InitMergetool ( ) : void |
|
|
|
Initialize ( ) : void |
|
|
|
Mergetool_Click ( object sender, EventArgs e ) : void |
|
|
|
OpenMergetool_Click ( object sender, EventArgs e ) : void |
|
|
|
Rescan_Click ( object sender, EventArgs e ) : void |
|
|
|
Reset_Click ( object sender, EventArgs e ) : void |
|
|
|
SaveAs ( string side ) : void |
|
|
|
button1_Click ( object sender, EventArgs e ) : void |
|
|
|
openToolStripMenuItem_Click ( object sender, EventArgs e ) : void |
|
|
|
openWithToolStripMenuItem_Click ( object sender, EventArgs e ) : void |
|
|
|
stageFile ( string filename ) : void |
|
|
