Exemple #1
0
        private void ucTextMergeEditor1_MergedFileSavedEvent(object sender, ucTextMergeEditor.MergedFileSavedEventArgs e)
        {
            CodeRootMapNode CurrentMapInfo = (CodeRootMapNode)treeListObjects.SelectedNode.Tag;
            string          mergedCode     = e.MergedFile.GetContents();

            CurrentMapInfo.SetMergedBaseConstruct(mergedCode);

            // Write the resolved changes to the merged file
            FileInformation.MergedFile = new TextFile(FileInformation.CodeRootMap.GetMergedCodeRoot().ToString());
            FileInformation.PerformSuperDiff();
            FireFileUpdatedEvent();
            PopulateGrid();
        }