summaryrefslogtreecommitdiff
path: root/.html/media/dev/merging-structural-changes/mercurial-merge-results.png
diff options
context:
space:
mode:
authorOwen Jacobson <owen.jacobson@grimoire.ca>2015-07-03 22:31:49 -0400
committerOwen Jacobson <owen.jacobson@grimoire.ca>2015-07-03 22:35:09 -0400
commit76aed6ef732de38d82245b3d674f70bab30221e5 (patch)
treed50e9a296d91ef8a49bcb29c3e80096f200a3c26 /.html/media/dev/merging-structural-changes/mercurial-merge-results.png
parent92f66d3e3a0996bb1fad9dc83d7e184f92673e5d (diff)
Fuck it, serve the files directly.
Diffstat (limited to '.html/media/dev/merging-structural-changes/mercurial-merge-results.png')
-rw-r--r--.html/media/dev/merging-structural-changes/mercurial-merge-results.pngbin0 -> 99313 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/.html/media/dev/merging-structural-changes/mercurial-merge-results.png b/.html/media/dev/merging-structural-changes/mercurial-merge-results.png
new file mode 100644
index 0000000..d20f360
--- /dev/null
+++ b/.html/media/dev/merging-structural-changes/mercurial-merge-results.png
Binary files differ