mergetools / vimdiff3on commit Merge branch 'nd/submodule-status-fix' (0cd58d8)
   1. "$MERGE_TOOLS_DIR/vimdiff"