Merge branch 'aa/status-hilite-branch' into next

* aa/status-hilite-branch:
  status: show branchname with a configurable color
This commit is contained in:
Junio C Hamano
2010-12-08 12:25:29 -08:00
5 changed files with 17 additions and 8 deletions

View File

@@ -1011,6 +1011,8 @@ static int parse_status_slot(const char *var, int offset)
{
if (!strcasecmp(var+offset, "header"))
return WT_STATUS_HEADER;
if (!strcasecmp(var+offset, "branch"))
return WT_STATUS_ONBRANCH;
if (!strcasecmp(var+offset, "updated")
|| !strcasecmp(var+offset, "added"))
return WT_STATUS_UPDATED;