[Feature Request] Allow editing text in Merge Conflicts Window #2168
Description
Currently the merge conflicts window has 3 panels (MINE, THEIRS, RESULT)
The Result panel should be editable by the user. For example if I have a paragraph where only 3 words are changed:
- 1 word change is in THEIRS
- the other 2 words changes is in MINE
In this scenario I would want to use MINE to get those 2 words and then add manually the 3rd missing word.
And when it comes to the UNDO button in the RESULTS panel, I think it should always revert every change done only inside that <<<HEAD === >>> block , including my manual changes if any.