Merge branch 'rs/deflate-init-cleanup' into maint

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d722b0a895fd650d04eb710fa08911085abff4c5..b8929084d079ef29987f7074dfb926f923b7697e 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2011,6 +2011,7 @@ _git_config ()
                color.status.changed
                color.status.header
                color.status.nobranch
+               color.status.unmerged
                color.status.untracked
                color.status.updated
                color.ui