mergetools / gvimdiff2on commit Merge branch 'pe/pull-rebase-v-q' (a8aa360)
   1. "$MERGE_TOOLS_DIR/vimdiff"