mergetools / gvimdiff3on commit builtin rebase: error out on incompatible option/mode combinations (b361bd7)
   1. "$MERGE_TOOLS_DIR/vimdiff"