mergetools / gvimdiffon commit Merge branch 'rs/t3700-clean-leftover' (5498d69)
   1. "$MERGE_TOOLS_DIR/vimdiff"