mergetools / gvimdiff2on commit branch: report errors in tracking branch setup (27852b2)
   1. "$MERGE_TOOLS_DIR/vimdiff"