wip wreckage slide

diff --git a/.gitignore b/.gitignore
index c4933359ddfc3cc3d038cabe0d409423bd2d4e54..aab7ce3860c5585c7ffb43e1cb175709e0b206c7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ dm-*.ps
 dm-*.ps.1
 slides.pdf
 slides.ps
+conflict.txt.eps

diff --git a/Makefile b/Makefile
index cef52215d6eda508119edc78efb0833d21808323..c96c93fee5612ac3f9b96b01f74864cf02b8fa02 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ SLIDES+= dm-wreck # made from 4
 #    X0    text
 #    X1    circles
 #    X2    edges
+#    X3    edges (53 is included in wreck)
 #   1X0-9  "master" note
 # for
 #    X =
@@ -34,11 +35,11 @@ all:        slides.pdf talk.ps
 
 dm-%.ps: dm.fig
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
-       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:$*9,1$*0:1$*9 <$@.1 $o
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+10:$*9,1$*0:1$*9 <$@.1 $o
 
-dm-wreck.ps: dm.fig
+dm-wreck.ps: dm.fig conflict.txt.eps
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
-       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:49,140:149 <$@.1 $o
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:3,53,+10:49,140:149 <$@.1 $o
 
 %.eps:   %.fig
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1

diff --git a/conflict.txt b/conflict.txt
index 36a0f4193259785e1ad1f06a617dac32e6f3483c..1664b377fcd9685b5d92327e028121b52dc7628a 100644 (file)
--- a/conflict.txt
+++ b/conflict.txt
@@ -7,7 +7,8 @@ When you have resolved this problem, run "git rebase --continue".
 If you prefer to skip this patch, run "git rebase --skip" instead.
 To check out the original branch and stop rebasing, run "git rebase --abort".
 
-git-debrebase: failed command: git rebase --onto 758a5851d24245ad9a0b872785623a3f7318dcdc b2d744310556e48b37cf98d6385c554b5e9a405a
+git-debrebase: failed command: git rebase --onto 758a5851d24245ad9a0b87278562
+3a3f7318dcdc b2d744310556e48b37cf98d6385c554b5e9a405a
 
 git-debrebase: error: subprocess failed with error exit status 128
 $

diff --git a/dm.fig b/dm.fig
index ce2e1d2f344073c640cd1119b003ae6e2fe69144..5e8be56c5cc5d08bacbf488b5133db3c70399c66 100644 (file)
--- a/dm.fig
+++ b/dm.fig
@@ -17,6 +17,13 @@ Single
         4635 -1575 4725 -1440 5265 -1440 5265 -1710 4725 -1710 4635 -1575
 4 0 0 41 -1 14 12 0.0000 4 120 480 4725 -1530 v1.2\001
 -6
+6 2925 -6030 8370 -4230
+2 5 0 1 0 -1 1 -1 -1 0.000 0 0 -1 0 0 5
+       0 conflict.txt.eps
+        3060 -5895 8287 -5895 8287 -4338 3060 -4338 3060 -5895
+2 2 0 2 0 7 2 -1 20 0.000 0 0 -1 0 0 5
+        2970 -5985 8325 -5985 8325 -4275 2970 -4275 2970 -5985
+-6
 1 3 0 2 0 7 51 -1 20 0.000 1 0.0000 6390 -5400 225 225 6390 -5400 6615 -5400
 1 3 0 2 0 7 51 -1 20 0.000 1 0.0000 6120 -4500 225 225 6120 -4500 6345 -4500
 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3870 -4500 225 225 3870 -4500 4095 -4500
@@ -67,14 +74,18 @@ Single
 2 3 0 2 0 7 41 -1 20 0.000 0 0 0 0 0 7
         7485 -3578 7680 -3690 7680 -3916 7485 -4028 7290 -3915 7290 -3690
         7485 -3578
-2 1 0 2 0 7 52 -1 -1 0.000 0 0 7 0 0 2
-        5850 -3600 6435 -5445
 2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 3
         3363 -2704 5580 -2700 5850 -3600
 2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 2
         4410 -1800 4664 -2691
 2 2 0 2 0 7 150 -1 -1 0.000 0 0 7 0 0 5
         6705 -5310 7515 -5310 7515 -5490 6705 -5490 6705 -5310
+2 1 0 2 0 7 52 -1 -1 0.000 0 0 7 0 0 2
+        6119 -4500 6410 -5438
+2 1 0 2 0 7 53 -1 -1 0.000 0 0 7 0 0 2
+        5844 -3616 6138 -4523
+2 2 0 2 7 7 3 -1 20 0.000 0 0 -1 0 0 5
+        3600 -4365 3960 -4365 3960 -4095 3600 -4095 3600 -4365
 3 2 0 2 0 7 41 -1 20 0.000 0 0 0 3
         4725 -1215 4005 -1665 3510 -1260
         0.000 -1.000 0.000