Package org.eclipse.egit.ui.internal.merge

Examples of org.eclipse.egit.ui.internal.merge.GitMergeEditorInput

44
45
46
47
48
49
50
51
52
53
54
55
56
    CompareEditorInput input;
    if (mergeMode == 0) {
      MergeModeDialog dlg = new MergeModeDialog(getShell(event));
      if (dlg.open() != Window.OK)
        return null;
      input = new GitMergeEditorInput(dlg.useWorkspace(), locations);
    } else {
      boolean useWorkspace = mergeMode == 1;
      input = new GitMergeEditorInput(useWorkspace, locations);
    }
    CompareUI.openCompareEditor(input);
    return null;
  }
View Full Code Here
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
        CompareEditorInput input;
        if (mergeMode == 0) {
          MergeModeDialog dlg = new MergeModeDialog(getParentShell());
          if (dlg.open() != Window.OK)
            return;
          input = new GitMergeEditorInput(dlg.useWorkspace(),
              locations);
        } else {
          boolean useWorkspace = mergeMode == 1;
          input = new GitMergeEditorInput(useWorkspace,
              locations);
        }
        CompareUI.openCompareEditor(input);
        return;
      } else if (skipCommitButton.getSelection()) {
View Full Code Here
TOP

Related Classes of org.eclipse.egit.ui.internal.merge.GitMergeEditorInput

  • org.eclipse.compare.CompareConfiguration
  • org.eclipse.compare.ITypedElement
  • org.eclipse.compare.structuremergeviewer.DiffNode
  • org.eclipse.compare.structuremergeviewer.IDiffContainer
  • org.eclipse.core.resources.IFile
  • org.eclipse.core.resources.IProject
  • org.eclipse.core.runtime.IPath
  • org.eclipse.core.runtime.Path
  • org.eclipse.egit.core.internal.storage.GitFileRevision
  • org.eclipse.egit.core.internal.storage.WorkingTreeFileRevision
    • Copyright © 2018 www.massapicom. All rights reserved.
    All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.