Comment by taberiand

How does the megamerge handle the case where two included branches overlap in changes and a new commit is made that applies to the overlap?