[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: changelog-merge plugin and edited ChangeLog entries
From: |
Miles Bader |
Subject: |
Re: changelog-merge plugin and edited ChangeLog entries |
Date: |
Sun, 27 Feb 2011 14:07:27 +0900 |
Eli Zaretskii <address@hidden> writes:
>> > I haven't had too many problems related to this with change-log-mode's
>> > change-log-resolve-conflict either.
>>
>> The nice thing about git-merge-changelog though is that it will handle
>> automatically for bulk merges (though apparently not for bzr), without
>> the user needing to get involved at all.
>
> Yea, yea, and git is better than bzr, and we should destroy
> Carthage...
Huh? I wasn't trying to be snide...
-miles
--
History, n. An account mostly false, of events mostly unimportant, which are
brought about by rulers mostly knaves, and soldiers mostly fools.
Re: changelog-merge plugin and edited ChangeLog entries, Glenn Morris, 2011/02/26