|
| From: | Bastien |
| Subject: | Re: Merge conflict cookie in dired.el (current HEAD in bzr) |
| Date: | Fri, 28 Sep 2012 00:56:50 +0200 |
| User-agent: | Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.2.50 (gnu/linux) |
Glenn Morris <address@hidden> writes: > Bastien wrote: > >> There is this merge conflict indication in dired.el >> which prevents Emacs from building: > > That is local to your copy. Indeed. No idea how this ended up here. > bzr revert lisp/dired.el Done. I could install the latest Emacs fine. Thanks, -- Bastien
| [Prev in Thread] | Current Thread | [Next in Thread] |