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: https://git.lorimer.id.au/gitweb.git/diff_plain/2a39bdb9a163f9f4ad11599dbeca87445eecb7d8?hp=--cc

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

Documentation fixes.

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

2a39bdb9a163f9f4ad11599dbeca87445eecb7d8