mergetools / gvimdiff2on commit Merge branch 'cb/fetch-set-upstream' (9437394)
   1. "$MERGE_TOOLS_DIR/vimdiff"