[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: emacs-23 to trunk: merge conflicts in files.el
|
From: |
Chong Yidong |
|
Subject: |
Re: emacs-23 to trunk: merge conflicts in files.el |
|
Date: |
Sat, 12 Feb 2011 20:54:27 -0500 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) |
Glenn Morris <address@hidden> writes:
> I tried merging emacs-23 to trunk, but was unable to resolve a series of
> confusing conflicts in files.el. Are commits 100467 and 100455 supposed
> to be merged?
I just did the merge. (I was going to do it immediately after 100467,
but got held up.)