From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Aug 2022 21:55:12 +0000 (-0700)
Subject: Merge branch 'jd/prompt-show-conflict'
X-Git-Tag: v2.38.0-rc0~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a572a5d4c1a00f276b4b6ed4e86cdb3d9aed51dc;p=thirdparty%2Fgit.git

Merge branch 'jd/prompt-show-conflict'

The bash prompt (in contrib/) learned to optionally indicate when
the index is unmerged.

* jd/prompt-show-conflict:
  git-prompt: show presence of unresolved conflicts at command prompt
---

a572a5d4c1a00f276b4b6ed4e86cdb3d9aed51dc