@drupflare/workforce - v0.3.0
    Preparing search index...

    Function mergeText

    • diff3 over lines, rendered back with conflict markers when both sides touched one

      Parameters

      • base: string
      • ours: string
      • theirs: string

      Returns MergedText