mergetools / vimdiff3on commit Merge branch 'mh/config-flip-xbit-back-after-checking' into maint (e524fb4)
   1. "$MERGE_TOOLS_DIR/vimdiff"