[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: The ChangeLog and merge conflicts
|
From: |
Eli Zaretskii |
|
Subject: |
Re: The ChangeLog and merge conflicts |
|
Date: |
Tue, 10 Feb 2015 05:43:40 +0200 |
> From: David Kastrup <address@hidden>
> Date: Tue, 10 Feb 2015 01:05:30 +0100
> Cc: emacs-devel <address@hidden>
>
> Take a look for the git-merge-changelog program (the respective Debian
> package is called just that).
Indeed. I'm using it and I have zero conflicts in ChangeLog files.