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

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

Junio C Hamano committed Mar 17, 2015 at 16:01 UTC 2a39bdb9a163f9f4ad11599dbeca87445eecb7d8

No changes.