#966485 git-buildpackage: [gbp pull] git merge invoked without --ff