[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: diff-mode fixes for empty lines in unified diffs
|
From: |
Stefan Monnier |
|
Subject: |
Re: diff-mode fixes for empty lines in unified diffs |
|
Date: |
Tue, 19 Feb 2008 15:42:37 -0500 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) |
>> PS: Miles, you'll probably get merge conflicts on the trunk, just send
>> them to me.
> Speaking of merge conflicts, the changes you did in the
> EMACS_22_BASE´s vc-hooks.el to avoid the loop in vc-find-root should
> be synched back to the trunk, shouldn't they? (They cause a conflict
> right now.)
Yes. Haven't heard 'bout the conflict, tho, where is it?
Stefan