[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Need review of emacs-25-merge branch
|
From: |
John Wiegley |
|
Subject: |
Re: Need review of emacs-25-merge branch |
|
Date: |
Wed, 30 Dec 2015 11:59:08 -0800 |
|
User-agent: |
Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) |
>>>>> Lars Magne Ingebrigtsen <address@hidden> writes:
> Can you post the twelve merge conflicts? That would make it easier to see
> whether the results are what we want...
Sure, here is the entire set of conflicts I dealt with yesterday:
emacs-25-merge.patch
Description: Text Data
emacs-25-merge.patch.sig
Description: Binary data
--
John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2
- Re: Need review of emacs-25-merge branch, (continued)
- Re: Need review of emacs-25-merge branch, John Wiegley, 2015/12/30
- Re: Need review of emacs-25-merge branch, Lars Magne Ingebrigtsen, 2015/12/30
- Re: Need review of emacs-25-merge branch, Eli Zaretskii, 2015/12/30
- Re: Need review of emacs-25-merge branch, John Wiegley, 2015/12/30
- Re: Need review of emacs-25-merge branch, Lars Magne Ingebrigtsen, 2015/12/30
- Re: Need review of emacs-25-merge branch, Eli Zaretskii, 2015/12/30
- Re: Need review of emacs-25-merge branch, Lars Magne Ingebrigtsen, 2015/12/30
- Re: Need review of emacs-25-merge branch, Eli Zaretskii, 2015/12/30
- Re: Need review of emacs-25-merge branch, John Wiegley, 2015/12/30
- Re: Need review of emacs-25-merge branch, Lars Magne Ingebrigtsen, 2015/12/30
- Re: Need review of emacs-25-merge branch,
John Wiegley <=
- Re: Need review of emacs-25-merge branch, Paul Eggert, 2015/12/30
- Re: Need review of emacs-25-merge branch, John Wiegley, 2015/12/30
Message not available
Message not available