help/diff-how.png help/diff-toolbar.png help/diff-window.png help/diffing.html help/main.html help/merge-how.png help/merge-toolbar.png help/merge-window.png help/merging.html auto.png calamari.png color.png conflict.png diff.png eraser.png paint.png save.png spray.png theirs.png yours.png