From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sun, 19 Jan 2014 03:50:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/407dc6ca2c4b3df42bed78ec4aeaa4a3a86f3d87?hp=21a516eeb0a2d7440d9cf7bd0d0dc7e19117ce84

Merge remote-tracking branch 'origin/master'
---

diff --git a/diff-hl-margin.el b/diff-hl-margin.el
index eb871b225..dac0b853d 100644
--- a/diff-hl-margin.el
+++ b/diff-hl-margin.el
@@ -1,6 +1,6 @@
 ;;; diff-hl-margin.el --- Highlight buffer changes on margins -*- lexical-binding: t -*-
 
-;; Copyright (C) 2012-2013  Free Software Foundation, Inc.
+;; Copyright (C) 2012-2014  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -19,7 +19,7 @@
 
 ;;; Commentary:
 
-;; This is a global mode, it modified `diff-hl-mode' to use the margin
+;; This is a global mode, it modifies `diff-hl-mode' to use the margin
 ;; instead of the fringe. To toggle, type `M-x diff-hl-margin-mode'.
 ;;
 ;; Compared to the default behavior, this makes `diff-hl-mode'