Merge branch 'aa/status-hilite-branch' into next
commitd00551d33475cc1a41ca107af98180fe0afdd403
authorJunio C Hamano <gitster@pobox.com>
Sat, 11 Dec 2010 00:40:56 +0000 (10 16:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 11 Dec 2010 00:40:56 +0000 (10 16:40 -0800)
treed56d1ba455aae19291142e8416f1e429bb4d77a5
parent0018aa6bc5b3f5ea28b4a5793c8cc5c8c66539e1
parent148135fc24dce1e61cfd7fcedea4210095099e78
Merge branch 'aa/status-hilite-branch' into next

* aa/status-hilite-branch:
  default color.status.branch to "same as header"
wt-status.c