config,completion: add color.status.unmerged
commit0d6accc01d4073d685ece5ba9fd0a439539a5a02
authorMichael J Gruber <git@drmicha.warpmail.net>
Tue, 10 Mar 2015 16:11:09 +0000 (10 17:11 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Mar 2015 22:27:59 +0000 (10 15:27 -0700)
tree08a9a783a6869fd6c0f4698c015edb2cc497dd71
parent9874fca7122563e28d699a911404fc49d2a24f1c
config,completion: add color.status.unmerged

Reported-by: "Mladen B." <mladen074@gmail.com>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt
contrib/completion/git-completion.bash