|
| From: | Glenn Morris |
| Subject: | Re: Merge conflict cookie in dired.el (current HEAD in bzr) |
| Date: | Thu, 27 Sep 2012 18:19:48 -0400 |
| User-agent: | Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
Bastien wrote: > There is this merge conflict indication in dired.el > which prevents Emacs from building: That is local to your copy. bzr revert lisp/dired.el
| [Prev in Thread] | Current Thread | [Next in Thread] |