mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 15:46:26 -04:00
Replace merge-tool with merge options menu that allows resolving all conflicts for selected files as ours, theirs, or union, while still providing access to the merge tool. |
||
|---|---|---|
| .. | ||
| conflicts.go | ||
| README.md | ||
This package contains shared helper functions for tests. It is not intended to contain any actual tests itself.