diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-29 14:55:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-29 14:55:12 -0700 |
| commit | a572a5d4c1a00f276b4b6ed4e86cdb3d9aed51dc (patch) | |
| tree | 07d6910329ff0ea169a3ed606a17248159e5ede5 /t/t4013/diff.format-patch_--inline_--stdout_initial..master^ | |
| parent | bc820cf9e6b529b07d95000f1ca60827b855182b (diff) | |
| parent | e03acd0d4ad75115f454041fac3300ae796f108f (diff) | |
| download | git-a572a5d4c1a00f276b4b6ed4e86cdb3d9aed51dc.tar.gz git-a572a5d4c1a00f276b4b6ed4e86cdb3d9aed51dc.zip | |
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
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master^')
0 files changed, 0 insertions, 0 deletions