mergetools / gvimdiff2on commit Merge branch 'fc/show-non-empty-errors-in-test' (01c0615)
   1. "$MERGE_TOOLS_DIR/vimdiff"