mergetools / gvimdiff2on commit Merge branch 'sg/t0020-conversion-fix' (df19317)
   1. "$MERGE_TOOLS_DIR/vimdiff"