For a more complex merge, you can take a look at the 'Branching' video, near the end, we show a merge between two branches in a graphics editor. We also give a

For a more complex merge, you can take a look at the 'Branching' video, near the end, we show a merge between two branches in a graphics editor. We also give a brief overview of the Diff/Merge model here: http://coreobject.org/technotes/#diffmerge http://coreobject.org/technotes/#diffmerge