mergetools / gvimdiff3on commit commit: add support for --fixup <commit> -m"<extra message>" (30884c9)
   1. "$MERGE_TOOLS_DIR/vimdiff"