AutomergeMode was renamed to FileFavor
Fix ggit_patch_to_string