mergetools / gvimdiff2on commit rebase -i: do not invent onelines when expanding/collapsing SHA-1s (1f4044a)
   1. "$MERGE_TOOLS_DIR/vimdiff"