Automagically merging ChangeLog files with mercurial or git
When a project keeps a GNU style ChangeLog file to keep track of who changed what where then those files can be automagically merged if you use mercurial or git. gnulib contains a module git-merge-changelog which, despite the name, works perfectly with several version control systems. To install it: git clone git://git.savannah.gnu.org/gnulib.git cd gnulib ./gnulib-tool […]