-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
According to Bruno Haible on 7/4/2009 3:26 AM:
> Fix assertion.
> * lib/git-merge-changelog.c (compute_mapping): In the case where file1
> contains more exact copies of a given entry than file2, leave the extra
> copies unpaired
FYI, I've just moved the argv-iter module and its tests from coreutils/gl
into gnulib, because I'm teaching mkid and xtokid (from the GNU idutils
package) the --files0-from option, so that package will also use this module.
>From 675fbd30d44edd7ecfca9e9013424b187eb3db70 Mon Sep 17 00:00:00 2001
Fr
Eric Blake wrote:
> This time, git removes the temporary .merge_file_*, but I confirmed that
> they can be recreated via:
>
> $ git show 5f008b:ChangeLog > file1
> $ git show 0b17f4:ChangeLog > file2
> $ git show cd172d:ChangeLog > file3
> $ git-merge-changelog --split-merged-entry file[123]
Than
