News for hackers. Stuff that matters.

A comment on Mergiraf: a syntax-aware merge driver for Git. Parent comment

Re:Mergiraf: a syntax-aware merge driver for Git by wetneb on Saturday November 09, 2024 @08:47AM (#42094394)
Yes, see this example: https://mergiraf.org/conflicts.html#line-based-merges
[ Parent | on HN ]

There are no comments on this comment yet.