mergetools / vimdiff2on commit Merge branch 'ks/status-initial-commit' (7e46f19)
   1. "$MERGE_TOOLS_DIR/vimdiff"