17
17
__doc__ = """Merge hook for GNU-format ChangeLog files
23
23
changelog_merge_files = ChangeLog
28
34
The algorithm this implements is very simple: it emits all the entries in OTHER
29
35
that are new compared to the common base version, followed by all the entries