Single
-2
1200 2
-6 5490 -2760 5685 -2610
-4 0 0 30 -1 14 20 0.0000 4 150 195 5490 -2610 e\001
--6
-6 4590 -2820 4785 -2565
-4 0 0 30 -1 14 20 0.0000 4 255 195 4590 -2610 @\001
--6
-6 3195 -2805 3390 -2610
-4 0 0 30 -1 14 20 0.0000 4 195 195 3195 -2610 D\001
--6
-1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 900 -2700 225 225 900 -2700 1125 -2700
-1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 1800 -2700 225 225 1800 -2700 2025 -2700
-1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 2070 -3600 225 225 2070 -3600 2295 -3600
-1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 2340 -4500 225 225 2340 -4500 2565 -4500
-1 3 0 2 0 7 21 -1 20 0.000 1 0.0000 2610 -5400 225 225 2610 -5400 2835 -5400
-1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 6390 -5400 225 225 6390 -5400 6615 -5400
-1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 6120 -4500 225 225 6120 -4500 6345 -4500
-1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 5850 -3600 225 225 5850 -3600 6075 -3600
-1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 4680 -2700 225 225 4680 -2700 4905 -2700
-1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 5580 -2700 225 225 5580 -2700 5805 -2700
+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
-1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3870 -4500 225 225 3870 -4500 4095 -4500
-1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 4140 -5400 225 225 4140 -5400 4365 -5400
-1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3330 -2700 225 225 3330 -2700 3555 -2700
-2 1 0 2 0 7 22 -1 20 0.000 0 0 -1 0 0 2
- 2340 -4500 2610 -5400
-2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 3
- 4590 -2700 5580 -2700 6390 -5400
-2 1 0 2 0 7 32 -1 -1 0.000 0 0 7 0 0 3
- 1980 -2700 3330 -2700 4140 -5400
-2 1 0 2 0 7 12 -1 -1 0.000 0 0 -1 0 0 3
- 450 -2700 1800 -2700 2340 -4500
-2 1 1 2 0 7 12 -1 -1 6.000 0 0 7 0 0 2
- 450 -2700 0 -2700
-4 0 0 10 -1 14 20 0.0000 4 210 195 2250 -4410 2\001
-4 0 0 10 -1 14 20 0.0000 4 195 195 810 -2610 A\001
-4 0 0 10 -1 14 20 0.0000 4 195 195 1710 -2610 B\001
-4 0 0 10 -1 14 20 0.0000 4 210 195 1980 -3510 1\001
-4 0 0 20 -1 14 20 0.0000 4 210 390 2430 -5310 D3\001
-4 0 0 40 -1 14 20 0.0000 4 210 195 6255 -5310 2\001
-4 0 0 40 -1 14 20 0.0000 4 210 195 5715 -3510 1\001
-4 0 0 40 -1 14 20 0.0000 4 90 195 6390 -5310 "\001
-4 0 0 40 -1 14 20 0.0000 4 210 195 5985 -4410 3\001
-4 0 0 40 -1 14 20 0.0000 4 90 195 6120 -4410 "\001
-4 0 0 40 -1 14 20 0.0000 4 90 195 5850 -3510 "\001
-4 0 0 30 -1 14 20 0.0000 4 210 195 4005 -5310 2\001
-4 0 0 30 -1 14 20 0.0000 4 90 195 4140 -5310 '\001
-4 0 0 30 -1 14 20 0.0000 4 210 195 3735 -4410 3\001
-4 0 0 30 -1 14 20 0.0000 4 90 195 3870 -4410 '\001
-4 0 0 30 -1 14 20 0.0000 4 90 195 3330 -2610 '\001
4 0 0 30 -1 14 20 0.0000 4 210 195 3465 -3510 1\001
4 0 0 30 -1 14 20 0.0000 4 90 195 3555 -3510 '\001
+-6
+6 3150 -6930 8595 -5130
+2 5 0 1 0 -1 1 -1 20 0.000 0 0 -1 0 0 5
+ 0 conflict.txt.eps
+ 3285 -6795 8512 -6795 8512 -5238 3285 -5238 3285 -6795
+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 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 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
+1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 4140 -5400 225 225 4140 -5400 4365 -5400
+1 3 0 2 0 7 111 -1 20 0.000 1 0.0000 360 -2700 225 225 360 -2700 585 -2700
+1 3 0 2 0 7 111 -1 20 0.000 1 0.0000 1260 -2700 225 225 1260 -2700 1485 -2700
+1 3 0 2 0 7 111 -1 20 0.000 1 0.0000 1530 -3600 225 225 1530 -3600 1755 -3600
+1 3 0 2 0 7 111 -1 20 0.000 1 0.0000 1800 -4500 225 225 1800 -4500 2025 -4500
+1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 3330 -2700 225 225 3330 -2700 3555 -2700
+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 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
+ 1800 -4500 2070 -5400
+2 1 0 2 0 7 112 -1 -1 0.000 0 0 -1 0 0 3
+ -90 -2700 1260 -2700 1800 -4500
+2 1 1 2 0 7 112 -1 -1 6.000 0 0 7 0 0 2
+ -90 -2700 -540 -2700
+2 3 0 2 0 7 162 -1 -1 0.000 0 0 7 0 0 6
+ 7335 -7200 7425 -7065 8910 -7065 8910 -7335 7425 -7335 7335 -7200
+2 1 1 2 0 7 162 -1 -1 6.000 0 0 7 0 0 2
+ 630 -7290 -585 -7290
+2 2 0 2 0 7 230 -1 -1 0.000 0 0 7 0 0 5
+ 4455 -5310 5265 -5310 5265 -5490 4455 -5490 4455 -5310
+2 2 0 2 0 7 210 -1 -1 0.000 0 0 7 0 0 5
+ 2115 -4410 2925 -4410 2925 -4590 2115 -4590 2115 -4410
+2 3 0 2 0 7 161 -1 20 0.000 0 0 7 0 0 7
+ 6735 -6300 6930 -6412 6930 -6638 6735 -6750 6540 -6637 6540 -6412
+ 6735 -6300
+2 3 0 2 0 7 141 -1 20 0.000 0 0 0 0 0 7
+ 4680 -2475 4875 -2587 4875 -2813 4680 -2925 4485 -2812 4485 -2587
+ 4680 -2475
+2 3 0 2 0 7 141 -1 20 0.000 0 0 0 0 0 7
+ 5580 -2475 5775 -2587 5775 -2813 5580 -2925 5385 -2812 5385 -2587
+ 5580 -2475
+2 3 0 2 0 7 141 -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 142 -1 -1 0.000 0 0 7 0 0 3
+ 3363 -2704 5580 -2700 5850 -3600
+2 1 0 2 0 7 142 -1 -1 0.000 0 0 7 0 0 2
+ 4410 -1800 4664 -2691
+2 1 0 2 0 7 1 -1 20 0.000 0 0 -1 0 0 2
+ 6345 -4680 8550 -5175
+2 1 0 2 0 7 1 -1 20 0.000 0 0 -1 0 0 2
+ 3195 -5175 5850 -4680
+2 2 0 2 7 7 3 -1 20 0.000 0 0 -1 0 0 5
+ 3870 -5265 4230 -5265 4230 -4815 3870 -4815 3870 -5265
+2 2 0 2 0 7 220 -1 -1 0.000 0 0 7 0 0 5
+ 2385 -5310 3195 -5310 3195 -5490 2385 -5490 2385 -5310
+2 2 0 2 0 7 251 -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 153 -1 -1 0.000 0 0 7 0 0 2
+ 5844 -3616 6138 -4523
+2 1 0 2 0 7 152 -1 -1 0.000 0 0 7 0 0 2
+ 6119 -4500 6410 -5438
+2 1 0 2 0 7 162 -1 -1 0.000 0 0 -1 0 0 2
+ 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 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
+3 2 0 2 0 7 144 -1 -1 0.000 0 0 0 3
+ 2430 -1215 1845 -1575 1350 -1170
+ 0.000 -1.000 0.000
+3 2 0 2 0 7 144 -1 20 0.000 0 0 0 3
+ 4725 -1215 4005 -1665 3510 -1260
+ 0.000 -1.000 0.000
+4 0 0 150 -1 14 20 0.0000 4 210 195 6255 -5310 2\001
+4 0 0 150 -1 14 20 0.0000 4 90 195 6390 -5310 "\001
+4 0 0 150 -1 14 20 0.0000 4 90 195 6120 -4410 "\001
+4 0 0 130 -1 14 20 0.0000 4 210 195 4005 -5310 2\001
+4 0 0 130 -1 14 20 0.0000 4 90 195 4140 -5310 '\001
+4 0 0 130 -1 14 20 0.0000 4 210 195 3735 -4410 3\001
+4 0 0 130 -1 14 20 0.0000 4 90 195 3870 -4410 '\001
+4 0 0 130 -1 14 20 0.0000 4 90 195 3330 -2610 '\001
+4 0 0 110 -1 14 20 0.0000 4 210 195 1710 -4410 2\001
+4 0 0 110 -1 14 20 0.0000 4 195 195 270 -2610 A\001
+4 0 0 110 -1 14 20 0.0000 4 195 195 1170 -2610 B\001
+4 0 0 110 -1 14 20 0.0000 4 210 195 1440 -3510 1\001
+4 0 0 110 -1 16 20 0.0000 4 240 1650 -135 -2160 Breakwater\001
+4 0 0 130 -1 14 20 0.0000 4 195 195 3195 -2610 C\001
+4 0 0 162 -1 14 12 0.0000 4 150 1440 7425 -7155 debian/1.2-1\001
+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 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
+4 0 0 112 -1 0 15 1.0472 4 225 675 540 -3015 change\001
+4 0 0 112 -1 0 15 1.0472 4 225 990 315 -3015 packaging\001
+4 0 0 112 -1 0 15 0.0000 4 165 765 1845 -3420 commit\001
+4 0 0 112 -1 0 15 0.0000 4 180 570 1845 -3555 queue\001
+4 0 0 112 -1 0 15 0.0000 4 165 480 1845 -3690 delta\001
+4 0 0 120 -1 0 15 0.0000 4 165 765 1125 -5310 commit\001
+4 0 0 120 -1 0 15 0.0000 4 165 615 1215 -5490 mixed\001
+4 0 0 132 -1 0 15 0.0000 4 210 900 4185 -4545 upstream\001
+4 0 0 132 -1 0 15 0.0000 4 225 660 4185 -4320 part of\001
+4 0 0 132 -1 0 15 0.0000 4 225 990 2835 -2295 packaging\001
+4 0 0 132 -1 0 15 0.0000 4 225 660 2925 -2115 part of\001
+4 0 0 162 -1 0 15 0.0000 4 225 2325 1485 -7065 published, eg salsa, dgit\001
+4 0 0 132 -1 14 12 0.0000 4 120 240 4815 -4320 C3\001
+4 0 0 132 -1 14 12 0.0000 4 120 240 3555 -2115 C3\001
+4 0 0 161 -1 0 15 0.0000 4 225 1170 5400 -6570 (re)generate\001
+4 0 0 160 -1 14 20 0.0000 4 195 195 6643 -6423 %\001
+4 0 0 130 -1 14 20 0.0000 4 90 195 7425 -3060 '\001
+4 0 0 132 -1 0 15 0.0000 4 165 735 8055 -3015 rebased\001
+4 0 0 132 -1 0 15 0.0000 4 165 765 8055 -2835 commit\001
+4 0 0 132 -1 0 15 0.0000 4 60 135 7785 -3105 =\001
+4 0 0 132 -1 0 15 0.0000 4 195 990 8055 -3195 rewritten/\001
+4 0 0 140 -1 14 20 0.0000 4 255 195 4590 -2610 @\001
+4 0 0 140 -1 14 20 0.0000 4 210 195 5490 -2610 d\001
+4 0 0 141 -1 0 15 0.0000 4 225 990 5580 -2295 changelog\001
+4 0 0 141 -1 0 15 0.0000 4 165 1125 5580 -2115 add version\001
+4 0 0 141 -1 0 15 0.0000 4 225 675 4095 -2970 special\001
+4 0 0 141 -1 16 20 0.0000 4 240 1035 4185 -3150 Anchor\001
+4 0 0 141 -1 0 15 0.0000 4 180 615 4770 -2970 merge\001
+4 0 0 141 -1 0 15 0.0000 4 225 1365 8055 -3825 autogenerated\001
+4 0 0 141 -1 0 15 0.0000 4 165 765 8055 -3600 commit\001
+4 0 0 141 -1 0 15 0.0000 4 60 135 7830 -3735 =\001
+4 0 0 140 -1 14 20 0.0000 4 90 195 5850 -3510 "\001
+4 0 0 140 -1 14 20 0.0000 4 210 195 5715 -3510 1\001
+4 0 0 150 -1 14 20 0.0000 4 210 195 5985 -4410 3\001
+4 0 0 1 -1 14 24 0.0000 4 255 480 5895 -4410 X3\001
+4 0 0 1 -1 16 24 0.0000 4 300 2340 6660 -7920 failed rebase\001
+4 0 0 250 -1 16 24 0.0000 4 375 3540 6255 -7920 after new-upstream\001
+4 0 0 119 -1 16 24 0.0000 4 390 7260 -900 -7920 git-debrebase - commit history structure\001
+4 0 0 269 -1 16 24 0.0000 4 375 2160 6255 -7920 after upload\001
+4 0 0 233 -1 16 24 0.0000 4 390 3435 6255 -7920 after git-debrebase\001
+4 0 0 4 -1 16 24 0.0000 4 300 2745 6255 -7920 aborted rebase\001
+4 0 0 5 -1 16 24 0.0000 4 375 3195 6304 -7546 for new-upstream\001
+4 0 0 270 -1 16 24 0.0000 4 390 2670 6255 -7920 rebasing again\001
+4 0 0 251 -1 14 12 0.0000 4 120 720 6750 -5355 master\001
+4 0 0 160 -1 14 20 0.0000 4 255 195 6865 -7215 /\001
+4 0 0 144 -1 16 20 0.0000 4 315 2895 1665 -810 Upstream git history\001
+4 0 32 130 -1 0 15 0.0000 4 180 1275 2329 -5455 no ref refers,\001
+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 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
~ijackson / talk-2018-dc18-gdr.git / blobdiff