mergetools / gvimdiff2on commit Merge branch 'pw/add-p-recount' (5eb8da8)
   1. "$MERGE_TOOLS_DIR/vimdiff"