you are viewing a single comment's thread
view the rest of the comments
[–] 2 points 2 years ago

Diff is only a viewing option

It isn't. Git uses 3-way diff/merge algorithm quite liberally behind the scenes.

  • source
  • parent