mergetools / gvimdiff2on commit Merge branch 'pw/rebase-i-regression-fix' (2becdbd)
   1. "$MERGE_TOOLS_DIR/vimdiff"