mergetools / gvimdiff3on commit rebase --rebase-merges: adjust man page for octopus support (caafecf)
   1. "$MERGE_TOOLS_DIR/vimdiff"