mergetools / gvimdiff2on commit Merge branch 'pw/rebase-i-squash-number-fix' (36fd1e8)
   1. "$MERGE_TOOLS_DIR/vimdiff"