[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merged Org 7.7
From: |
Glenn Morris |
Subject: |
Re: Merged Org 7.7 |
Date: |
Mon, 15 Aug 2011 17:27:01 -0400 |
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
Glenn Morris wrote:
> But surely the right way to do it is to look at the diff before you do
> the Org merge and see that it doesn't have anything unexpected.
And, rather than just copying the files from Org over the files in Emacs
(which is what I guess you are doing now), start by generating a diff
between current-version-of-Org and last-version-you-merged-to-Emacs, and
try to apply it to Emacs.
- Re: Merged Org 7.7, (continued)
Re: Merged Org 7.7, Bastien, 2011/08/15
Re: Merged Org 7.7, Eduard Wiebe, 2011/08/15
Re: Merged Org 7.7, Bastien, 2011/08/15
- Re: Merged Org 7.7, Glenn Morris, 2011/08/15
- Re: Merged Org 7.7, Bastien, 2011/08/15
- Re: Merged Org 7.7, Glenn Morris, 2011/08/17
- Re: Merged Org 7.7, Bastien, 2011/08/18
- Re: Merged Org 7.7, Glenn Morris, 2011/08/18
- Re: Merged Org 7.7, Bastien, 2011/08/19
Re: Merged Org 7.7, Bastien, 2011/08/15
Re: Merged Org 7.7, Bastien, 2011/08/16