mergetools / gvimdiff2on commit Merge branch 'bw/rebase-i-ignored-submodule-fix' (b50d82b)
   1. "$MERGE_TOOLS_DIR/vimdiff"