From b4e1d897d127263507f21ece87b4e95d8103d56a Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Thu, 3 Jan 2013 20:04:32 -0500 Subject: Imported "Merging Structural Changes" verbatim. --- .../merging-structural-changes/ideal-merge-results.png | Bin 0 -> 87122 bytes .../mercurial-merge-results.png | Bin 0 -> 99313 bytes .../subversion-merge-results.png | Bin 0 -> 114985 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 static/media/dev/merging-structural-changes/ideal-merge-results.png create mode 100644 static/media/dev/merging-structural-changes/mercurial-merge-results.png create mode 100644 static/media/dev/merging-structural-changes/subversion-merge-results.png (limited to 'static') diff --git a/static/media/dev/merging-structural-changes/ideal-merge-results.png b/static/media/dev/merging-structural-changes/ideal-merge-results.png new file mode 100644 index 0000000..cb78110 Binary files /dev/null and b/static/media/dev/merging-structural-changes/ideal-merge-results.png differ diff --git a/static/media/dev/merging-structural-changes/mercurial-merge-results.png b/static/media/dev/merging-structural-changes/mercurial-merge-results.png new file mode 100644 index 0000000..d20f360 Binary files /dev/null and b/static/media/dev/merging-structural-changes/mercurial-merge-results.png differ diff --git a/static/media/dev/merging-structural-changes/subversion-merge-results.png b/static/media/dev/merging-structural-changes/subversion-merge-results.png new file mode 100644 index 0000000..5ef2570 Binary files /dev/null and b/static/media/dev/merging-structural-changes/subversion-merge-results.png differ -- cgit v1.2.3