wip fonts 2

[talk-2018-dc18-gdr.git] / dm.fig

diff --git a/dm.fig b/dm.fig
index d0ea262ff568a79d58e4687a5a7e7bd4e602510d..2182cfaa7f5a6b957232774b0d6d6e59e5120e46 100644 (file)
--- a/dm.fig
+++ b/dm.fig
@@ -8,6 +8,7 @@ Single
 -2
 1200 2
 0 32 #888888
+0 33 #cccccc
 6 3330 -3870 3870 -3330
 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3600 -3600 225 225 3600 -3600 3825 -3600
 4 0 0 30 -1 14 20 0.0000 4 210 195 3465 -3510 1\001
@@ -20,10 +21,21 @@ Single
 2 2 0 2 0 7 2 -1 20 0.000 0 0 -1 0 0 5
         3195 -6885 8550 -6885 8550 -5175 3195 -5175 3195 -6885
 -6
+6 -960 -6810 5910 -4980
+2 2 0 2 0 7 10 -1 -1 0.000 0 0 7 0 0 5
+        -900 -6750 5850 -6750 5850 -5040 -900 -5040 -900 -6750
+2 2 0 2 7 7 11 -1 20 0.000 0 0 7 0 0 5
+        -945 -6795 5895 -6795 5895 -4995 -945 -4995 -945 -6795
+4 0 0 10 -1 2 20 0.0000 4 300 5505 -720 -6000 A multi-parent commit made by taking\001
+4 0 0 10 -1 3 20 0.0000 4 300 1860 -720 -6390 Pseudomerge\001
+4 0 0 10 -1 2 20 0.0000 4 300 6360 -720 -5670 just the contents of exactly one of its parents.\001
+4 0 0 10 -1 2 20 0.0000 4 300 1020 -720 -5220 e.g., by\001
+4 0 0 10 -1 14 20 0.0000 4 270 3315 630 -5220 git merge -s ours\001
+-6
 6 4620 -1725 5280 -1425
-2 3 0 2 0 7 44 -1 -1 0.000 0 0 7 0 0 6
+2 3 0 2 0 7 144 -1 -1 0.000 0 0 7 0 0 6
         4635 -1575 4725 -1440 5265 -1440 5265 -1710 4725 -1710 4635 -1575
-4 0 0 44 -1 14 12 0.0000 4 120 480 4725 -1530 v1.2\001
+4 0 0 144 -1 14 12 0.0000 4 120 480 4725 -1530 v1.2\001
 -6
 1 3 0 2 0 7 151 -1 20 0.000 1 0.0000 6390 -5400 225 225 6390 -5400 6615 -5400
 1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 3870 -4500 225 225 3870 -4500 4095 -4500
@@ -36,8 +48,8 @@ Single
 1 3 0 2 0 7 141 -1 20 0.000 1 0.0000 5850 -3600 225 225 5850 -3600 6075 -3600
 1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 7470 -3150 225 225 7470 -3150 7695 -3150
 1 3 0 2 0 7 151 -1 20 0.000 1 0.0000 6120 -4500 225 225 6120 -4500 6345 -4500
-1 3 0 2 0 7 121 -1 20 0.000 1 0.0000 2070 -5400 225 225 2070 -5400 2295 -5400
 1 3 0 2 0 7 145 -1 20 0.000 1 0.0000 4365 -1575 225 225 4365 -1575 4590 -1575
+1 3 0 2 0 7 121 -1 20 0.000 1 0.0000 2070 -5400 225 225 2070 -5400 2295 -5400
 2 1 0 2 0 7 132 -1 -1 0.000 0 0 7 0 0 3
         1305 -2700 3330 -2700 4140 -5400
 2 1 0 2 0 7 122 -1 20 0.000 0 0 -1 0 0 2
@@ -88,13 +100,23 @@ Single
         6745 -6522 6385 -5352
 2 1 0 2 0 7 162 -1 -1 0.000 0 0 7 0 0 3
         630 -7290 6975 -7290 6705 -6480
-2 3 0 2 0 7 161 -1 20 0.000 0 0 7 0 0 7
-        6960 -7087 7155 -7199 7155 -7425 6960 -7537 6765 -7424 6765 -7199
-        6960 -7087
 2 2 0 2 32 7 271 -1 20 0.000 0 0 7 0 0 5
         7290 -7380 9045 -7380 9045 -7560 7290 -7560 7290 -7380
 2 2 0 2 0 7 260 -1 -1 0.000 0 0 7 0 0 5
         7290 -7380 8100 -7380 8100 -7560 7290 -7560 7290 -7380
+2 3 0 2 0 7 161 -1 20 0.000 0 0 7 0 0 7
+        6960 -7087 7155 -7199 7155 -7425 6960 -7537 6765 -7424 6765 -7199
+        6960 -7087
+2 1 0 2 0 7 11 -1 20 0.000 0 0 -1 1 0 2
+       3 1 1.00 60.00 120.00
+        5850 -6750 6570 -7020
+2 2 0 2 32 7 10 -1 -1 0.000 0 0 7 0 0 5
+        -675 -7020 1080 -7020 1080 -7200 -675 -7200 -675 -7020
+2 2 0 2 7 7 999 -1 -1 0.000 0 0 -1 0 0 5
+        -1080 -450 10170 -450 10170 -8235 -1080 -8235 -1080 -450
+2 5 0 1 0 -1 24 -1 20 0.000 0 0 -1 0 0 5
+       0 helm-rebase-crop.ppm
+        3124 -4830 9990 -4830 9990 -1080 3124 -1080 3124 -4830
 3 2 0 2 0 7 144 -1 -1 0.000 0 0 0 3
         3510 -1260 2925 -1620 2430 -1215
         0.000 -1.000 0.000
@@ -122,7 +144,6 @@ Single
 4 0 0 230 -1 14 12 0.0000 4 120 720 4500 -5355 master\001
 4 0 0 220 -1 14 12 0.0000 4 120 720 2430 -5355 master\001
 4 0 0 210 -1 14 12 0.0000 4 120 720 2160 -4455 master\001
-4 0 0 120 -1 14 20 0.0000 4 210 390 1890 -5310 C3\001
 4 0 0 161 -1 12 12 0.0000 4 180 1080 5490 -6390 d/patches\001
 4 0 0 162 -1 0 12 0.0000 4 0 45 5130 -7335  \001
 4 0 0 162 -1 16 20 0.0000 4 315 2790 1215 -7425 Interchange branch\001
@@ -176,6 +197,10 @@ Single
 4 0 32 130 -1 0 15 0.0000 4 225 1140 2385 -5265 will be gc'd\001
 4 0 32 140 -1 0 15 0.0000 4 180 1275 4398 -5439 no ref refers,\001
 4 0 32 140 -1 0 15 0.0000 4 225 1140 4423 -5263 will be gc'd\001
-4 0 0 166 -1 0 15 0.0000 4 225 1290 5490 -7110 pseudomerge\001
 4 0 0 260 -1 14 12 0.0000 4 120 720 7335 -7425 master\001
 4 0 32 270 -1 14 12 0.0000 4 180 1800 7335 -7425 ffq-prev/master\001
+4 0 0 120 -1 14 20 0.0000 4 210 390 1890 -5310 C3\001
+4 0 0 10 -1 2 15 0.0000 4 225 1350 5400 -7110 pseudomerge\001
+4 0 0 166 -1 0 15 0.0000 4 225 1290 5490 -7110 pseudomerge\001
+4 0 32 10 -1 14 12 0.0000 4 180 1800 -630 -7065 ffq-prev/master\001
+4 0 32 10 -1 0 15 0.0000 4 225 1470 -675 -7380 was previously\001