mergetools / gvimdiff2on commit branch: colour upstream branches (dbda21f)
   1. "$MERGE_TOOLS_DIR/vimdiff"