Max Brunsfeld 697c2ba71f Enable merge conflict parsing for currently-unmerged files (#31549) ... Previously, we only enabled merge conflict parsing for files that were unmerged at the last time a change was detected to the repo's merge heads. Now we enable the parsing for these files *and* any files that are currently unmerged. The old strategy meant that conflicts produced via `git stash pop` would not be parsed. Release Notes: - Fixed parsing of merge conflicts when the conflict was produced by a `git stash pop`		2025-05-27 13:34:39 -07:00
..
src	Enable merge conflict parsing for currently-unmerged files (#31549)	2025-05-27 13:34:39 -07:00
Cargo.toml	Rename assistant_settings to agent_settings (#31513)	2025-05-27 15:16:55 +00:00
LICENSE-GPL	Add placeholder git panel (#21894)	2024-12-11 22:13:52 -05:00