From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Mar 2015 23:01:34 +0000 (-0700)
Subject: Merge branch 'mg/doc-status-color-slot'
X-Git-Tag: v2.4.0-rc0~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a39bdb9a163f9f4ad11599dbeca87445eecb7d8;p=thirdparty%2Fgit.git

Merge branch 'mg/doc-status-color-slot'

Documentation fixes.

* mg/doc-status-color-slot:
  config,completion: add color.status.unmerged
---

2a39bdb9a163f9f4ad11599dbeca87445eecb7d8