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

Merge conflict cookie in dired.el (current HEAD in bzr)

From: Bastien
Subject: Merge conflict cookie in dired.el (current HEAD in bzr)
Date: Fri, 28 Sep 2012 00:00:06 +0200
User-agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.2.50 (gnu/linux) 
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
reply via email to
[Prev in Thread] Current Thread [Next in Thread]