Merge commit 'e93367512080e540dc5dd126dfcb38b4a5e9415b' from diff-hl
authorDmitry Gutov <dgutov@yandex.ru>
Thu, 23 Jun 2016 01:18:12 +0000 (04:18 +0300)
committerDmitry Gutov <dgutov@yandex.ru>
Thu, 23 Jun 2016 01:18:12 +0000 (04:18 +0300)
1  2 
packages/diff-hl/README.md
packages/diff-hl/diff-hl-flydiff.el
packages/diff-hl/diff-hl.el

Simple merge
Simple merge
Simple merge