mergetools / gvimdiff2on commit Merge branch 'jc/test-parse-options-expect' (2997ea9)
   1. "$MERGE_TOOLS_DIR/vimdiff"