mergetools / gvimdiff3on commit Merge branch 'pw/rebase-i-regression-fix-tests' (5452224)
   1. "$MERGE_TOOLS_DIR/vimdiff"