[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: some bzrmerge.el questions

From: Glenn Morris
Subject: Re: some bzrmerge.el questions
Date: Fri, 14 Jan 2011 02:12:58 -0500
User-agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)

Unfortunately after resolving many text conflicts I ran into


which currently prevents dealing with the contents conflicts caused by
files deleted from trunk having been modified in emacs-23.
So at present it's impossible to merge emacs-23 to trunk, AFAICS. :(

reply via email to

[Prev in Thread] Current Thread [Next in Thread]