Sorry I didn't reply to this earlier. I believe that, since I just
deleted import-gnulib.sh, your problem should not occur again.
James.
On 06/03/2013 05:58 PM, Stefano Lattarini wrote:
> Otherwise, even after correctly setting the git configuration entry
> 'merge.merge-changelog.driver' to "git-merge-changelog %O %A %B"
> (which is perfectly valid), the 'import-gnulib.sh' script aborts
> with the following spurious error:
> ERROR:
Otherwise, even after correctly setting the git configuration entry
'merge.merge-changelog.driver' to "git-merge-changelog %O %A %B"
(which is perfectly valid), the 'import-gnulib.sh' script aborts
with the following spurious error:
ERROR: Merge driver git-merge-changelog is not executable.
ERROR:
