Comment Comment by wetneb Yes, see this example: https://mergiraf.org/conflicts.html#line-based-merges parent wetneb 2 years ago
