detect renames that occur between the common ancestor and the "ours" side or the common ancestor and the "theirs" side. This will enable the ability to merge between a modified and renamed file.
If the commits being merged have multiple merge bases,
do not build a recursive merge base (by merging the multiple merge bases),
instead simply use the first base. This flag provides a similar
merge base to git-merge-resolve.
do not write the REUC extension on the generated index.
If a conflict occurs, exit immediately instead of attempting to continue resolving conflicts. The merge operation will fail with
GGIT_EMERGECONFLICTand no index will be returned.