mergetools / vimdiff2on commit Merge branch 'mm/commit-template-squelch-advice-messages' (b4980c6)
   1. "$MERGE_TOOLS_DIR/vimdiff"