Stefan Haller d0078bf05c Recognize conflict markers that have no label ...

Git only writes the space after a marker when there is a label to write
after it, and the label can be empty: `git checkout -m` with the diff3
conflict style, for instance, has no name for the common ancestor, so it
writes a bare "|||||||" line.

2026-08-08 12:43:42 +02:00

..

app

Recognize a repo that has no work tree instead of bailing out

2026-08-08 11:15:01 +02:00

cheatsheet

Render every key for a binding in the cheatsheet

2026-05-25 15:18:18 +02:00

commands

Honor the conflict-marker-size gitattribute

2026-08-08 12:43:42 +02:00

common

Move NewDummyCommon to pkg/common

2025-05-06 09:43:26 +02:00

config

Move Github PR cache out of state.yml into a separate file

2026-08-02 19:09:22 +02:00

constants

Adapt links

2026-07-31 08:42:51 +02:00

env

Remember how to get back to a repo we entered a submodule from

2026-08-08 11:15:01 +02:00

fakes

Modernize all codes

2025-11-15 10:46:23 +01:00

gocui

Exclude more commit trailers from auto-wrapping

2026-08-02 19:22:34 +02:00

gui

Recognize conflict markers that have no label

2026-08-08 12:43:42 +02:00

i18n

Run the stash operations with a waiting status

2026-08-08 12:26:18 +02:00

integration

Honor the conflict-marker-size gitattribute

2026-08-08 12:43:42 +02:00

jsonschema

Fold legacy quit-alt1 into the multi-key quit binding

2026-05-25 15:32:47 +02:00

logs

Fix Windows linter errors

2026-06-16 16:21:13 +02:00

snake

Enable intrange linter, and fix warnings

2025-06-30 18:30:11 +02:00

tasks

Give task commands a Terminate method instead of exposing their process

2026-08-04 07:03:27 +02:00

theme

Copy gocui files into lazygit repo under pkg/gocui

2026-04-30 14:29:08 +02:00

updates

Change direct access to Common.UserConfig to a getter

2024-08-18 10:24:52 +02:00

utils

Make StringStack generic

2026-08-08 11:15:01 +02:00