mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 07:36:27 -04:00
bc9fafff02
Git doesn't always write conflict markers of seven characters: the conflict-marker-size gitattribute overrides that per file, and it is set for good reasons — for file types whose regular content tends to contain marker-looking lines, such as documentation about merging, or test scripts. We hard-code seven characters everywhere we look for markers, so none of that works. Prepare for honoring the attribute by threading the marker size through everything that recognizes a marker, carried on the file model. Nothing fills it in yet, so we still use git's default size of seven everywhere, and matching is unchanged: a marker consists of exactly that many marker characters, and all but the "=======" one are followed by a space and a label. |
||
|---|---|---|
| .. | ||
| author.go | ||
| branch.go | ||
| commit.go | ||
| commit_file.go | ||
| commit_test.go | ||
| file.go | ||
| github.go | ||
| ref.go | ||
| remote.go | ||
| remote_branch.go | ||
| stash_entry.go | ||
| submodule_config.go | ||
| tag.go | ||
| working_tree_state.go | ||
| worktree.go | ||