mergetools / gvimdiff3on commit Merge branch 'sb/t3600-cleanup' (2d91cb7)
   1. "$MERGE_TOOLS_DIR/vimdiff"