mergetools / gvimdiff2on commit Merge branch 'jc/revision-dash-count-parsing' (7a3b4e3)
   1. "$MERGE_TOOLS_DIR/vimdiff"