Re: Merged Org 7.7

[Glenn Morris]

Bastien wrote:

>> You've clobbered my changes to the copyright years in every org file.
>
> I somehow missed this.
>
> Can you point me to the relevant mail on emacs-diff?

Sure.

http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00062.html

It's totally unhelpful, because Org merges are so massive.

You did the same thing in today's merge of the docs:

http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00157.html

  -Copyright @copyright{} 2004-2011  Free Software Foundation, Inc.
  +Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
  +Free Software Foundation, Inc.

  [...]

  +% arch-tag: 139f6750-5cfc-49ca-92b5-237fe5795290