index
:
lazygit
adapt-pr-template
assets
better-custom-command-models
box-view-padding
bronze
checkout-by-name
context-manager-cleanups
convert-translation-sets-to-json
copper
create-pull-request/patch
crowdin
custom-command-output-title
delete-and-edit-custom-commands-history-items
dependabot/go_modules/golang.org/x/crypto-0.1.0
dependabot/go_modules/golang.org/x/net-0.17.0
divergence-from-base-branch-command
divergence-from-base-branch-display
ensure-test-list-correctness
fast-ancestor-check
feature/open-file-without-specified-line
fix-clicking-in-status-panel
fix-custom-commands-in-per-repo-config
fix-deadlock-reporting
fix-duplicate-options-map-entries
fix-go-generate-on-windows
fix-highlight-in-staging-panel
fix-linter-warnings
fix-loading-commits-with-very-long-subjects
fix-loading-translation-file-on-windows
fix-open-PR/double/escape
fix-pty-layout-problems
fix-range-select-in-staging-view
fix-skip-hook
fix-sponsors
fix-stale-content-with-overwriteLines
fix-support-for-old-style-non-interactive-rebase
fix-tooltip-for-fixup
gh-integration-2
gh-integration-3
github-release-notes
improve-find-base-commit-for-fixup
improve-find-base-commit-for-fixup-for-hunks-on-master
improve-mouse-support-for-commit-message-panel
integration-tests-on-windows
keybinding-menu-headings
lazygit-crash-course
make-author-length-configurable
make-author-length-configurable-2
mark-last-commit-to-change-file
master
menu-prompt
more-section-headers
per-repo-config-files
rebase-onto-base-branch
rebase-onto-base-branch-jesse
release-notes
rename-custom-command-to-shell-command
render-graph-for-divergence-log
run-integration-tests-on-windows
search-the-model-instead-of-the-view
show-current-option-in-menus
show-merged-status
show-sync-status-in-branches-panel-jesse
smaller-git-builder
support-hyperlinks
support-triangular-workflow
switch-tabs-with-panel-jump-keys
test-m-keybinding
update-keybinding-names
upstream-test
use-interactive-shell-for-custom-commands
worktree-support-2
writing-integration-test-result-to-file
Mirror of https://github.com/jesseduffield/lazygit
matthias
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
pkg
/
gui
/
mergeconflicts
Mode
Name
Size
-rw-r--r--
merge_conflicts.go
2550
log
stats
plain
