Finish merging lecture

9392ae2f · Martijn Vermaat · fb3a9271 · fb3a9271 · 9392ae2f · 9392ae2f
Commit 9392ae2f authored Nov 30, 2015 by Martijn Vermaat
12 changed files
--- a/merging/images/example-hue-ahead.png
+++ b/merging/images/example-hue-ahead.png
--- a/merging/images/example-hue-diverged.eps
+++ b/merging/images/example-hue-diverged.eps
--- a/merging/images/example-hue-diverged.png
+++ b/merging/images/example-hue-diverged.png
--- a/merging/images/example-hue-ahead.eps
+++ b/merging/images/example-hue-ahead.eps
--- a/merging/images/example-hue-merged.png
+++ b/merging/images/example-hue-merged.png
--- a/merging/images/example-hue-merged2.eps
+++ b/merging/images/example-hue-merged2.eps
--- a/merging/images/example-hue-merged2.png
+++ b/merging/images/example-hue-merged2.png
--- a/merging/images/example-hue-pushed.eps
+++ b/merging/images/example-hue-pushed.eps
--- a/merging/images/example-hue-pushed.png
+++ b/merging/images/example-hue-pushed.png
--- a/merging/images/example-hue.eps
+++ b/merging/images/example-hue.eps
--- a/merging/images/example-hue.png
+++ b/merging/images/example-hue.png
--- a/merging/merging.tex
+++ b/merging/merging.tex