mergetools / gvimdiff2on commit rebase --rebase-merges: a "merge" into a new root is a fast-forward (9c85a1c)
   1. "$MERGE_TOOLS_DIR/vimdiff"