mergetools / gvimdiff2on commit Merge branch 'ms/non-ascii-ticks' (327e524)
   1. "$MERGE_TOOLS_DIR/vimdiff"