fix: show conflict markers in status diff view#2937

leno23 wants to merge 1 commit into

gitui-org:mastergitui-org/gitui:masterfrom

leno23:fix/conflict-diff-2865leno23/gitui:fix/conflict-diff-2865Copy head branch name to clipboard