[Emacs-diffs] master updated (84b6bc9 -> 0f3d1b7)

[Tino Calancha]

calancha pushed a change to branch master.

      from  84b6bc9   Fix make-dist typo
       new  e39d593   diff-mode: Improve default faces for buffer ancestor
       new  0f3d1b7   Show ancestor buffer in 3way merges


Summary of changes:
 doc/misc/ediff.texi   |   8 ++-
 etc/NEWS              |   5 ++
 lisp/vc/ediff-help.el |   2 +-
 lisp/vc/ediff-init.el |  46 ++++++++++-----
 lisp/vc/ediff-util.el | 155 ++++++++++++++++++++++++++++++++------------------
 lisp/vc/ediff-wind.el |  86 ++++++++++++++++++++++++----
 6 files changed, 219 insertions(+), 83 deletions(-)