@ethomson Can one combine those flags?

IOW, would `GIT_MERGE_NO_FASTFORWARD | GIT_MERGE_FASTFORWARD_ONLY` make sense?