[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merge conflict cookie in dired.el (current HEAD in bzr)
|
From: |
Andreas Schwab |
|
Subject: |
Re: Merge conflict cookie in dired.el (current HEAD in bzr) |
|
Date: |
Fri, 28 Sep 2012 12:02:12 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux) |
Eli Zaretskii <address@hidden> writes:
> If some of them did, either commit those files (preferred),
Glenn already does that, automagically.
Andreas.
--
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."