Description of the illustration f355_damp.jpg
This image shows the diff and merge process.
