Code

tests: check git does not barf on merge.ff values for future versions of git