[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master abf0823 2/2: New test tramp-test30-make-auto-save-file-name
|
From: |
Eli Zaretskii |
|
Subject: |
Re: master abf0823 2/2: New test tramp-test30-make-auto-save-file-name |
|
Date: |
Wed, 27 May 2015 21:10:19 +0300 |
> From: Yuri Khan <address@hidden>
> Date: Thu, 28 May 2015 00:04:20 +0600
> Cc: Eli Zaretskii <address@hidden>, Glenn Morris <address@hidden>, Emacs
> developers <address@hidden>
>
> On Wed, May 27, 2015 at 11:39 PM, Michael Albinus
> <address@hidden> wrote:
>
> > But isn't it stupid, that we get rid of ChangeLogs, and afterwards
> > people start to mimic them for convenience?
>
> The point of getting rid of changelogs is so that you no longer have
> to merge them. And changelogs are a kind of files which are very
> conflict-prone.
Only if you don't have git-merge-changelog installed and configured in
Git.