Merging tools


merge point is an actual point in time

three way merge tool