697c2ba71f
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` |
||
|---|---|---|
| .. | ||
| askpass_modal.rs | ||
| blame_ui.rs | ||
| branch_picker.rs | ||
| commit_message_prompt.txt | ||
| commit_modal.rs | ||
| commit_tooltip.rs | ||
| commit_view.rs | ||
| conflict_view.rs | ||
| git_panel.rs | ||
| git_panel_settings.rs | ||
| git_ui.rs | ||
| onboarding.rs | ||
| picker_prompt.rs | ||
| project_diff.rs | ||
| remote_output.rs | ||
| repository_selector.rs | ||