Class ConflictDialogController


  • public class ConflictDialogController
    extends java.lang.Object
    Show conflict dialog.
    • Method Summary

      All Methods Instance Methods Concrete Methods 
      Modifier and Type Method Description
      java.lang.String show​(java.lang.String baseText, java.lang.String remoteText, java.lang.String localText)  
      • Methods inherited from class java.lang.Object

        equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    • Constructor Detail

      • ConflictDialogController

        public ConflictDialogController()
    • Method Detail

      • show

        public java.lang.String show​(java.lang.String baseText,
                                     java.lang.String remoteText,
                                     java.lang.String localText)