mergetools / gvimdiff3on commit Merge branch 'sb/t1020-cleanup' (ce6ab23)
   1. "$MERGE_TOOLS_DIR/vimdiff"