mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-14 11:23:09 +02:00
3928d0ebda
When stopping in a rebase because of a conflict, it is nice to see the commit that git is trying to apply. Create a fake todo entry labelled "conflict" for this, and show the "<-- YOU ARE HERE ---" string for that one (in red) instead of for the real current head. |
||
---|---|---|
.. | ||
authors | ||
graph | ||
icons | ||
branches.go | ||
commits_test.go | ||
commits.go | ||
files_test.go | ||
files.go | ||
menu.go | ||
reflog_commits.go | ||
remote_branches.go | ||
remotes.go | ||
stash_entries.go | ||
submodules.go | ||
suggestions.go | ||
tags.go | ||
working_tree.go |