mergetools / gvimdiff2on commit Merge branch 'mm/two-more-xstrfmt' (b760481)
   1. "$MERGE_TOOLS_DIR/vimdiff"