mergetools / gvimdiff2on commit remote.c: untangle error logic in branch_get_upstream (1ca41a1)
   1. "$MERGE_TOOLS_DIR/vimdiff"