mergetools / vimdiff2on commit Merge branch 'jk/date-c-double-semicolon' (7522c58)
   1. "$MERGE_TOOLS_DIR/vimdiff"