mergetools / gvimdiff2on commit Merge branch 'pw/no-editor-in-rebase-i-implicit' (69dd6e5)
   1. "$MERGE_TOOLS_DIR/vimdiff"