mergetools / gvimdiff2on commit Use hyphenated "remote-tracking branch" (docs and comments) (30aa96c)
   1. "$MERGE_TOOLS_DIR/vimdiff"