emacs-devel
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Dynamic loading progress

From: Steinar Bang
Subject: Re: Dynamic loading progress
Date: Sun, 08 Nov 2015 13:54:00 +0100
User-agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) 
>>>>> Philipp Stephani <address@hidden>:
> In order to produce a clean patch, I tried merging the master (from
> emacs-mirror) or emacs-24 branch, but both produced too many merge
> conflicts (even in files untouched by the module code).

What kind of conflicts in what files? Could you provide some detail?

What was the command line sequence you used to do the merges from master
and emacs-24?
reply via email to
[Prev in Thread] Current Thread [Next in Thread]