Hacker News new | ask | show | jobs
by wetneb 592 days ago
Yes, see this example: https://mergiraf.org/conflicts.html#line-based-merges