mergetools / vimdiff3on commit Sync with 2.3.1 (11acff1)
   1. "$MERGE_TOOLS_DIR/vimdiff"