From: Dmitry Gutov <dgutov@yandex.ru>
Date: Wed, 9 Sep 2015 18:58:50 +0000 (+0300)
Subject: Merge commit '7fa7f099c7008d521dbbb57a1546f11535544536' from diff-hl
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/a454a247a9c98b5a5c6eaee3957a9378e8aa483e

Merge commit '7fa7f099c7008d521dbbb57a1546f11535544536' from diff-hl
---

a454a247a9c98b5a5c6eaee3957a9378e8aa483e
diff --cc packages/diff-hl/diff-hl-flydiff.el
index 000000000,53d31f749..53d31f749
mode 000000,100644..100644
--- a/packages/diff-hl/diff-hl-flydiff.el
+++ b/packages/diff-hl/diff-hl-flydiff.el