Code

merge: backport GIT_MERGE_AUTOEDIT support