mergetools / vimdiff2on commit Merge branch 'fc/trivial' (152a9c1)
   1. "$MERGE_TOOLS_DIR/vimdiff"