[Emacs-diffs] master updated (aeefbc4 -> 01dbf2a)

[Noam Postavsky]

npostavs pushed a change to branch master.

      from  aeefbc4   Fix the bootstrap differently, so zerop can be where it 
belongs
       new  1222ff5   Don't skip epg-tests even with gpg 2.0 (Bug#23561)
       new  01dbf2a   Speed up smerge-refine-regions by avoiding fsync


Summary of changes:
 lisp/vc/smerge-mode.el |  7 ++++---
 test/lisp/epg-tests.el | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)