merge.c
77.2 KB
-
merge: build virtual base of multiple merge bases · 75dee59c
When the commits to merge have multiple common ancestors, build a "virtual" base tree by merging the common ancestors.
Edward Thomson committed
When the commits to merge have multiple common ancestors, build a "virtual" base tree by merging the common ancestors.