Merge branch 'mh/config-flip-xbit-back-after-checking' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"