all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Merge conflict cookie in dired.el (current HEAD in bzr)
@ 2012-09-27 22:00 Bastien
  2012-09-27 22:19 ` Glenn Morris
  0 siblings, 1 reply; 8+ messages in thread
From: Bastien @ 2012-09-27 22:00 UTC (permalink / raw)
  To: emacs-devel

Hi,

There is this merge conflict indication in dired.el
which prevents Emacs from building:

<<<<<<< TREE
;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "cab4c9952dac1073157ff3fa23cd93b8")
=======
;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "244227ae609852d3dc10ab3fc40ba9ab")
>>>>>>> MERGE-SOURCE

-- 
 Bastien




^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2012-09-28 18:15 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-27 22:00 Merge conflict cookie in dired.el (current HEAD in bzr) Bastien
2012-09-27 22:19 ` Glenn Morris
2012-09-27 22:56   ` Bastien
2012-09-28  7:27     ` Eli Zaretskii
2012-09-28  7:36       ` Bastien
2012-09-28 10:02       ` Andreas Schwab
2012-09-28 15:30       ` Juri Linkov
2012-09-28 18:15         ` Paul Eggert

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.