mergetools / gvimdiff3on commit git-rebase.txt: address confusion between --no-ff vs --force-rebase (983f464)
   1. "$MERGE_TOOLS_DIR/vimdiff"