[gitignore] Set merge.ff to false (for git flow)