mergetools / gvimdiff2on commit Merge branch 'rt/rebase-p-no-merge-summary' (8c731e9)
   1. "$MERGE_TOOLS_DIR/vimdiff"