mergetools / gvimdiff3on commit builtin rebase: optionally auto-detect the upstream (8f5986d)
   1. "$MERGE_TOOLS_DIR/vimdiff"