3 ms·
Yes, see this example: https://mergiraf.org/conflicts.html#line-based-merges https://mergiraf.org/conflicts.html#line-based-merges
by wetneb 2y ago
Yes, see this example: https://mergiraf.org/conflicts.html#line-based-merges https://mergiraf.org/conflicts.html#line-based-merges