anchor.diff:        ro_html->add( '</tr>' ).
       ENDLOOP.
       ro_html->add( '</table>' ).
  -
  +    ro_html->add( '<br>' ).
  +    ro_html->add( '<b>' ).
  +    ro_html->add( ms_merge-conflict ).
  +    ro_html->add( '</b>' ).
       ro_html->add( '</div>' ).
       ro_html->add( footer( ) ).
   
  
positive.code:            END OF ty_ancestor.
  
      TYPES: BEGIN OF ty_merge,
               repo   TYPE REF TO lcl_repo_online,
               source TYPE lcl_git_transport=>ty_branch_list,
               target TYPE lcl_git_transport=>ty_branch_list,
               common TYPE ty_ancestor,
               stree  TYPE lcl_git_porcelain=>ty_expanded_tt,
               ttree  TYPE lcl_git_porcelain=>ty_expanded_tt,
               ctree  TYPE lcl_git_porcelain=>ty_expanded_tt,
               result TYPE lcl_git_porcelain=>ty_expanded_tt,
               stage  TYPE REF TO lcl_stage,
             END OF ty_merge.
  
      CLASS-METHODS:
  
negative.code:       <ls_ancestor>-commit = lv_commit.
        <ls_ancestor>-tree = ls_commit-tree.
        <ls_ancestor>-body = ls_commit-body.
        FIND REGEX '^[\w\s]+ <.*> (\d{10}) .\d{4}$' IN ls_commit-author
          SUBMATCHES <ls_ancestor>-time ##NO_TEXT.
        ASSERT sy-subrc = 0.
      ENDLOOP.
  
      SORT rt_ancestors BY time DESCENDING.
  
    ENDMETHOD.
  
  