Merge Editor: Detect/resolve conflict by adding same content in both inputs

[lszomoru]

Testing #158819

• Clone https://github.com/hediet/diff-merge-dataset
• Use the Load Merge Editor State From Folder command and select the merges/demo1 folder
• Select result in the quick pick
• The first conflict is caused by the same content being added in both inputs on line 44. Should this edge case be detected and automatically resolved by accepting either one of the two sides?
  

[hediet]

/duplicate #158942 and #157496

[vscodenpa]

Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for similar existing issues. See also our issue reporting guidelines.

Happy Coding!