A merge in which the content of two versions has diverged and must be
  reconciled.

  See also branch merge.