| ofs | hex dump | ascii |
|---|---|---|
| 0000 | b3 f2 0d 0a f8 24 95 4a 63 00 00 00 00 00 00 00 00 08 00 00 00 40 00 00 00 73 8b 00 00 00 64 00 | .....$.Jc............@...s....d. |
| 0020 | 00 64 01 00 6b 00 00 6c 01 00 5a 01 00 01 64 00 00 64 02 00 6b 02 00 5a 02 00 64 00 00 64 02 00 | .d..k..l..Z...d..d..k..Z..d..d.. |
| 0040 | 6b 03 00 5a 03 00 64 00 00 64 02 00 6b 04 00 5a 04 00 64 00 00 64 02 00 6b 05 00 5a 05 00 64 03 | k..Z..d..d..k..Z..d..d..k..Z..d. |
| 0060 | 00 65 06 00 66 01 00 64 04 00 84 00 00 83 00 00 59 5a 07 00 64 05 00 84 00 00 5a 08 00 64 06 00 | .e..f..d........YZ..d.....Z..d.. |
| 0080 | 84 00 00 5a 09 00 64 07 00 65 0a 00 66 01 00 64 08 00 84 00 00 83 00 00 59 5a 0b 00 64 09 00 84 | ...Z..d..e..f..d........YZ..d... |
| 00a0 | 00 00 5a 0c 00 64 02 00 53 28 0a 00 00 00 69 ff ff ff ff 28 01 00 00 00 74 01 00 00 00 5f 4e 74 | ..Z..d..S(....i....(....t...._Nt |
| 00c0 | 18 00 00 00 43 61 6e 74 52 65 70 72 6f 63 65 73 73 41 6e 64 53 68 6f 77 42 61 73 65 63 00 00 00 | ....CantReprocessAndShowBasec... |
| 00e0 | 00 00 00 00 00 01 00 00 00 42 00 00 00 73 08 00 00 00 65 00 00 5a 01 00 52 53 28 00 00 00 00 28 | .........B...s....e..Z..RS(....( |
| 0100 | 02 00 00 00 74 08 00 00 00 5f 5f 6e 61 6d 65 5f 5f 74 0a 00 00 00 5f 5f 6d 6f 64 75 6c 65 5f 5f | ....t....__name__t....__module__ |
| 0120 | 28 00 00 00 00 28 00 00 00 00 28 00 00 00 00 73 28 00 00 00 2f 73 79 73 2f 6c 69 62 2f 70 79 74 | (....(....(....s(.../sys/lib/pyt |
| 0140 | 68 6f 6e 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 52 01 00 00 | hon/mercurial/simplemerge.pyR... |
| 0160 | 00 19 00 00 00 73 02 00 00 00 06 01 63 02 00 00 00 04 00 00 00 04 00 00 00 43 00 00 00 73 89 00 | .....s......c............C...s.. |
| 0180 | 00 00 7c 00 00 64 01 00 19 7c 00 00 64 02 00 19 6a 01 00 70 07 00 01 74 00 00 82 01 00 01 7c 01 | ..|..d...|..d...j..p...t......|. |
| 01a0 | 00 64 01 00 19 7c 01 00 64 02 00 19 6a 01 00 70 07 00 01 74 00 00 82 01 00 01 74 01 00 7c 00 00 | .d...|..d...j..p...t......t..|.. |
| 01c0 | 64 01 00 19 7c 01 00 64 01 00 19 83 02 00 7d 02 00 74 02 00 7c 00 00 64 02 00 19 7c 01 00 64 02 | d...|..d......}..t..|..d...|..d. |
| 01e0 | 00 19 83 02 00 7d 03 00 7c 02 00 7c 03 00 6a 00 00 6f 0e 00 01 7c 02 00 7c 03 00 66 02 00 53 6e | .....}..|..|..j..o...|..|..f..Sn |
| 0200 | 05 00 01 64 03 00 53 64 03 00 53 28 04 00 00 00 73 1a 01 00 00 47 69 76 65 6e 20 74 77 6f 20 72 | ...d..Sd..S(....s....Given.two.r |
| 0220 | 61 6e 67 65 73 20 72 65 74 75 72 6e 20 74 68 65 20 72 61 6e 67 65 20 77 68 65 72 65 20 74 68 65 | anges.return.the.range.where.the |
| 0240 | 79 20 69 6e 74 65 72 73 65 63 74 20 6f 72 20 4e 6f 6e 65 2e 0a 0a 20 20 20 20 3e 3e 3e 20 69 6e | y.intersect.or.None.......>>>.in |
| 0260 | 74 65 72 73 65 63 74 28 28 30 2c 20 31 30 29 2c 20 28 30 2c 20 36 29 29 0a 20 20 20 20 28 30 2c | tersect((0,.10),.(0,.6)).....(0, |
| 0280 | 20 36 29 0a 20 20 20 20 3e 3e 3e 20 69 6e 74 65 72 73 65 63 74 28 28 30 2c 20 31 30 29 2c 20 28 | .6).....>>>.intersect((0,.10),.( |
| 02a0 | 35 2c 20 31 35 29 29 0a 20 20 20 20 28 35 2c 20 31 30 29 0a 20 20 20 20 3e 3e 3e 20 69 6e 74 65 | 5,.15)).....(5,.10).....>>>.inte |
| 02c0 | 72 73 65 63 74 28 28 30 2c 20 31 30 29 2c 20 28 31 30 2c 20 31 35 29 29 0a 20 20 20 20 3e 3e 3e | rsect((0,.10),.(10,.15)).....>>> |
| 02e0 | 20 69 6e 74 65 72 73 65 63 74 28 28 30 2c 20 39 29 2c 20 28 31 30 2c 20 31 35 29 29 0a 20 20 20 | .intersect((0,.9),.(10,.15)).... |
| 0300 | 20 3e 3e 3e 20 69 6e 74 65 72 73 65 63 74 28 28 30 2c 20 39 29 2c 20 28 37 2c 20 31 35 29 29 0a | .>>>.intersect((0,.9),.(7,.15)). |
| 0320 | 20 20 20 20 28 37 2c 20 39 29 0a 20 20 20 20 69 00 00 00 00 69 01 00 00 00 4e 28 04 00 00 00 74 | ....(7,.9).....i....i....N(....t |
| 0340 | 0e 00 00 00 41 73 73 65 72 74 69 6f 6e 45 72 72 6f 72 74 03 00 00 00 6d 61 78 74 03 00 00 00 6d | ....AssertionErrort....maxt....m |
| 0360 | 69 6e 74 04 00 00 00 4e 6f 6e 65 28 04 00 00 00 74 02 00 00 00 72 61 74 02 00 00 00 72 62 74 02 | int....None(....t....rat....rbt. |
| 0380 | 00 00 00 73 61 74 02 00 00 00 73 62 28 00 00 00 00 28 00 00 00 00 73 28 00 00 00 2f 73 79 73 2f | ...sat....sb(....(....s(.../sys/ |
| 03a0 | 6c 69 62 2f 70 79 74 68 6f 6e 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 | lib/python/mercurial/simplemerge |
| 03c0 | 2e 70 79 74 09 00 00 00 69 6e 74 65 72 73 65 63 74 1c 00 00 00 73 0e 00 00 00 00 0c 1c 01 1c 02 | .pyt....intersect....s.......... |
| 03e0 | 17 01 17 01 0d 01 0e 02 63 06 00 00 00 08 00 00 00 05 00 00 00 43 00 00 00 73 74 00 00 00 7c 02 | ........c............C...st...|. |
| 0400 | 00 7c 01 00 18 7c 05 00 7c 04 00 18 6a 03 00 6f 08 00 01 74 00 00 53 6e 01 00 01 78 50 00 74 01 | .|...|..|...j..o...t..Sn...xP.t. |
| 0420 | 00 74 02 00 7c 01 00 7c 02 00 83 02 00 74 02 00 7c 04 00 7c 05 00 83 02 00 83 02 00 44 5d 29 00 | .t..|..|.....t..|..|........D]). |
| 0440 | 5c 02 00 7d 06 00 7d 07 00 7c 00 00 7c 06 00 19 7c 03 00 7c 07 00 19 6a 03 00 6f 08 00 01 74 00 | \..}..}..|..|...|..|...j..o...t. |
| 0460 | 00 53 71 3f 00 01 71 3f 00 57 74 03 00 53 64 01 00 53 28 02 00 00 00 73 3f 00 00 00 43 6f 6d 70 | .Sq?..q?.Wt..Sd..S(....s?...Comp |
| 0480 | 61 72 65 20 61 5b 61 73 74 61 72 74 3a 61 65 6e 64 5d 20 3d 3d 20 62 5b 62 73 74 61 72 74 3a 62 | are.a[astart:aend].==.b[bstart:b |
| 04a0 | 65 6e 64 5d 2c 20 77 69 74 68 6f 75 74 20 73 6c 69 63 69 6e 67 2e 0a 20 20 20 20 4e 28 04 00 00 | end],.without.slicing......N(... |
| 04c0 | 00 74 05 00 00 00 46 61 6c 73 65 74 03 00 00 00 7a 69 70 74 06 00 00 00 78 72 61 6e 67 65 74 04 | .t....Falset....zipt....xranget. |
| 04e0 | 00 00 00 54 72 75 65 28 08 00 00 00 74 01 00 00 00 61 74 06 00 00 00 61 73 74 61 72 74 74 04 00 | ...True(....t....at....astartt.. |
| 0500 | 00 00 61 65 6e 64 74 01 00 00 00 62 74 06 00 00 00 62 73 74 61 72 74 74 04 00 00 00 62 65 6e 64 | ..aendt....bt....bstartt....bend |
| 0520 | 74 02 00 00 00 69 61 74 02 00 00 00 69 62 28 00 00 00 00 28 00 00 00 00 73 28 00 00 00 2f 73 79 | t....iat....ib(....(....s(.../sy |
| 0540 | 73 2f 6c 69 62 2f 70 79 74 68 6f 6e 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 | s/lib/python/mercurial/simplemer |
| 0560 | 67 65 2e 70 79 74 0d 00 00 00 63 6f 6d 70 61 72 65 5f 72 61 6e 67 65 32 00 00 00 73 0e 00 00 00 | ge.pyt....compare_range2...s.... |
| 0580 | 00 03 15 01 08 01 22 00 0c 01 15 01 0c 02 74 0a 00 00 00 4d 65 72 67 65 33 54 65 78 74 63 00 00 | ......".......t....Merge3Textc.. |
| 05a0 | 00 00 00 00 00 00 09 00 00 00 42 00 00 00 73 8c 00 00 00 65 00 00 5a 01 00 64 00 00 5a 02 00 64 | ..........B...s....e..Z..d..Z..d |
| 05c0 | 0d 00 64 0d 00 64 0d 00 64 01 00 84 03 00 5a 04 00 64 0d 00 64 0d 00 64 0d 00 64 02 00 64 03 00 | ..d..d..d.....Z..d..d..d..d..d.. |
| 05e0 | 64 04 00 64 0d 00 65 05 00 64 05 00 84 08 00 5a 06 00 64 06 00 84 00 00 5a 07 00 64 07 00 84 00 | d..d..e..d.....Z..d.....Z..d.... |
| 0600 | 00 5a 08 00 64 08 00 84 00 00 5a 09 00 64 09 00 84 00 00 5a 0a 00 64 0a 00 84 00 00 5a 0b 00 65 | .Z..d.....Z..d.....Z..d.....Z..e |
| 0620 | 0c 00 65 0b 00 83 01 00 5a 0b 00 64 0b 00 84 00 00 5a 0d 00 64 0c 00 84 00 00 5a 0e 00 52 53 28 | ..e.....Z..d.....Z..d.....Z..RS( |
| 0640 | 0e 00 00 00 73 a0 00 00 00 33 2d 77 61 79 20 6d 65 72 67 65 20 6f 66 20 74 65 78 74 73 2e 0a 0a | ....s....3-way.merge.of.texts... |
| 0660 | 20 20 20 20 47 69 76 65 6e 20 73 74 72 69 6e 67 73 20 42 41 53 45 2c 20 4f 54 48 45 52 2c 20 54 | ....Given.strings.BASE,.OTHER,.T |
| 0680 | 48 49 53 2c 20 74 72 69 65 73 20 74 6f 20 70 72 6f 64 75 63 65 20 61 20 63 6f 6d 62 69 6e 65 64 | HIS,.tries.to.produce.a.combined |
| 06a0 | 20 74 65 78 74 0a 20 20 20 20 69 6e 63 6f 72 70 6f 72 61 74 69 6e 67 20 74 68 65 20 63 68 61 6e | .text.....incorporating.the.chan |
| 06c0 | 67 65 73 20 66 72 6f 6d 20 62 6f 74 68 20 42 41 53 45 2d 3e 4f 54 48 45 52 20 61 6e 64 20 42 41 | ges.from.both.BASE->OTHER.and.BA |
| 06e0 | 53 45 2d 3e 54 48 49 53 2e 63 07 00 00 00 07 00 00 00 02 00 00 00 43 00 00 00 73 9a 00 00 00 7c | SE->THIS.c............C...s....| |
| 0700 | 01 00 7c 00 00 5f 00 00 7c 02 00 7c 00 00 5f 01 00 7c 03 00 7c 00 00 5f 02 00 7c 04 00 64 00 00 | ..|.._..|..|.._..|..|.._..|..d.. |
| 0720 | 6a 08 00 6f 13 00 01 74 04 00 69 05 00 7c 01 00 83 01 00 7d 04 00 6e 01 00 01 7c 05 00 64 00 00 | j..o...t..i..|.....}..n...|..d.. |
| 0740 | 6a 08 00 6f 13 00 01 74 04 00 69 05 00 7c 02 00 83 01 00 7d 05 00 6e 01 00 01 7c 06 00 64 00 00 | j..o...t..i..|.....}..n...|..d.. |
| 0760 | 6a 08 00 6f 13 00 01 74 04 00 69 05 00 7c 03 00 83 01 00 7d 06 00 6e 01 00 01 7c 04 00 7c 00 00 | j..o...t..i..|.....}..n...|..|.. |
| 0780 | 5f 06 00 7c 05 00 7c 00 00 5f 07 00 7c 06 00 7c 00 00 5f 08 00 64 00 00 53 28 01 00 00 00 4e 28 | _..|..|.._..|..|.._..d..S(....N( |
| 07a0 | 09 00 00 00 74 08 00 00 00 62 61 73 65 74 65 78 74 74 05 00 00 00 61 74 65 78 74 74 05 00 00 00 | ....t....basetextt....atextt.... |
| 07c0 | 62 74 65 78 74 52 07 00 00 00 74 05 00 00 00 6d 64 69 66 66 74 0d 00 00 00 73 70 6c 69 74 6e 65 | btextR....t....mdifft....splitne |
| 07e0 | 77 6c 69 6e 65 73 74 04 00 00 00 62 61 73 65 52 11 00 00 00 52 14 00 00 00 28 07 00 00 00 74 04 | wlinest....baseR....R....(....t. |
| 0800 | 00 00 00 73 65 6c 66 52 1b 00 00 00 52 1c 00 00 00 52 1d 00 00 00 52 20 00 00 00 52 11 00 00 00 | ...selfR....R....R....R....R.... |
| 0820 | 52 14 00 00 00 28 00 00 00 00 28 00 00 00 00 73 28 00 00 00 2f 73 79 73 2f 6c 69 62 2f 70 79 74 | R....(....(....s(.../sys/lib/pyt |
| 0840 | 68 6f 6e 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 74 08 00 00 | hon/mercurial/simplemerge.pyt... |
| 0860 | 00 5f 5f 69 6e 69 74 5f 5f 42 00 00 00 73 18 00 00 00 00 01 09 01 09 01 09 01 0d 01 13 01 0d 01 | .__init__B...s.................. |
| 0880 | 13 01 0d 01 13 01 09 01 09 01 73 07 00 00 00 3c 3c 3c 3c 3c 3c 3c 73 07 00 00 00 3d 3d 3d 3d 3d | ..........s....<<<<<<<s....===== |
| 08a0 | 3d 3d 73 07 00 00 00 3e 3e 3e 3e 3e 3e 3e 63 09 00 00 00 0e 00 00 00 09 00 00 00 63 00 00 00 73 | ==s....>>>>>>>c............c...s |
| 08c0 | d2 02 00 00 74 00 00 7c 00 00 5f 01 00 64 01 00 7d 09 00 74 02 00 7c 00 00 69 03 00 83 01 00 64 | ....t..|.._..d..}..t..|..i.....d |
| 08e0 | 02 00 6a 04 00 6f 46 00 01 7c 00 00 69 03 00 64 02 00 19 69 04 00 64 03 00 83 01 00 6f 0a 00 01 | ..j..oF..|..i..d...i..d.....o... |
| 0900 | 64 03 00 7d 09 00 71 6b 00 01 7c 00 00 69 03 00 64 02 00 19 69 04 00 64 04 00 83 01 00 6f 0a 00 | d..}..qk..|..i..d...i..d.....o.. |
| 0920 | 01 64 04 00 7d 09 00 71 6b 00 01 6e 01 00 01 7c 07 00 6f 14 00 01 7c 08 00 6f 0d 00 01 74 05 00 | .d..}..qk..n...|..o...|..o...t.. |
| 0940 | 83 00 00 82 01 00 6e 01 00 01 7c 01 00 6f 12 00 01 7c 04 00 64 05 00 17 7c 01 00 17 7d 04 00 6e | ......n...|..o...|..d...|...}..n |
| 0960 | 01 00 01 7c 02 00 6f 12 00 01 7c 06 00 64 05 00 17 7c 02 00 17 7d 06 00 6e 01 00 01 7c 03 00 6f | ...|..o...|..d...|...}..n...|..o |
| 0980 | 19 00 01 7c 07 00 6f 12 00 01 7c 07 00 64 05 00 17 7c 03 00 17 7d 07 00 6e 01 00 01 7c 00 00 69 | ...|..o...|..d...|...}..n...|..i |
| 09a0 | 06 00 83 00 00 7d 0a 00 7c 08 00 74 07 00 6a 08 00 6f 13 00 01 7c 00 00 69 08 00 7c 0a 00 83 01 | .....}..|..t..j..o...|..i..|.... |
| 09c0 | 00 7d 0a 00 6e 01 00 01 78 c7 01 7c 0a 00 44 5d bf 01 7d 0b 00 7c 0b 00 64 02 00 19 7d 0c 00 7c | .}..n...x..|..D]..}..|..d...}..| |
| 09e0 | 0c 00 64 06 00 6a 02 00 6f 32 00 01 78 9f 01 74 09 00 7c 0b 00 64 07 00 19 7c 0b 00 64 08 00 19 | ..d..j..o2..x..t..|..d...|..d... |
| 0a00 | 83 02 00 44 5d 12 00 7d 0d 00 7c 00 00 69 0a 00 7c 0d 00 19 56 01 71 40 01 57 71 0b 01 01 7c 0c | ...D]..}..|..i..|...V.q@.Wq...|. |
| 0a20 | 00 64 09 00 6a 02 00 70 0d 00 01 7c 0c 00 64 0a 00 6a 02 00 6f 32 00 01 78 53 01 74 09 00 7c 0b | .d..j..p...|..d..j..o2..xS.t..|. |
| 0a40 | 00 64 07 00 19 7c 0b 00 64 08 00 19 83 02 00 44 5d 12 00 7d 0d 00 7c 00 00 69 03 00 7c 0d 00 19 | .d...|..d......D]..}..|..i..|... |
| 0a60 | 56 01 71 8c 01 57 71 0b 01 01 7c 0c 00 64 0b 00 6a 02 00 6f 32 00 01 78 14 01 74 09 00 7c 0b 00 | V.q..Wq...|..d..j..o2..x..t..|.. |
| 0a80 | 64 07 00 19 7c 0b 00 64 08 00 19 83 02 00 44 5d 12 00 7d 0d 00 7c 00 00 69 0b 00 7c 0d 00 19 56 | d...|..d......D]..}..|..i..|...V |
| 0aa0 | 01 71 cb 01 57 71 0b 01 01 7c 0c 00 64 0c 00 6a 02 00 6f cc 00 01 74 07 00 7c 00 00 5f 01 00 7c | .q..Wq...|..d..j..o...t..|.._..| |
| 0ac0 | 04 00 7c 09 00 17 56 01 78 2b 00 74 09 00 7c 0b 00 64 0d 00 19 7c 0b 00 64 0e 00 19 83 02 00 44 | ..|...V.x+.t..|..d...|..d......D |
| 0ae0 | 5d 12 00 7d 0d 00 7c 00 00 69 03 00 7c 0d 00 19 56 01 71 1c 02 57 7c 07 00 64 11 00 6a 09 00 6f | ]..}..|..i..|...V.q..W|..d..j..o |
| 0b00 | 3b 00 01 7c 07 00 7c 09 00 17 56 01 78 2f 00 74 09 00 7c 0b 00 64 07 00 19 7c 0b 00 64 08 00 19 | ;..|..|...V.x/.t..|..d...|..d... |
| 0b20 | 83 02 00 44 5d 12 00 7d 0d 00 7c 00 00 69 0a 00 7c 0d 00 19 56 01 71 60 02 57 6e 01 00 01 7c 05 | ...D]..}..|..i..|...V.q`.Wn...|. |
| 0b40 | 00 7c 09 00 17 56 01 78 2b 00 74 09 00 7c 0b 00 64 0f 00 19 7c 0b 00 64 10 00 19 83 02 00 44 5d | .|...V.x+.t..|..d...|..d......D] |
| 0b60 | 12 00 7d 0d 00 7c 00 00 69 0b 00 7c 0d 00 19 56 01 71 9b 02 57 7c 06 00 7c 09 00 17 56 01 71 0b | ..}..|..i..|...V.q..W|..|...V.q. |
| 0b80 | 01 01 74 0d 00 7c 0c 00 83 01 00 82 01 00 71 0b 01 57 64 11 00 53 28 12 00 00 00 73 27 00 00 00 | ..t..|........q..Wd..S(....s'... |
| 0ba0 | 52 65 74 75 72 6e 20 6d 65 72 67 65 20 69 6e 20 63 76 73 2d 6c 69 6b 65 20 66 6f 72 6d 2e 0a 20 | Return.merge.in.cvs-like.form... |
| 0bc0 | 20 20 20 20 20 20 20 73 01 00 00 00 0a 69 00 00 00 00 73 02 00 00 00 0d 0a 73 01 00 00 00 0d 74 | .......s.....i....s......s.....t |
| 0be0 | 01 00 00 00 20 74 09 00 00 00 75 6e 63 68 61 6e 67 65 64 69 01 00 00 00 69 02 00 00 00 52 11 00 | .....t....unchangedi....i....R.. |
| 0c00 | 00 00 74 04 00 00 00 73 61 6d 65 52 14 00 00 00 74 08 00 00 00 63 6f 6e 66 6c 69 63 74 69 03 00 | ..t....sameR....t....conflicti.. |
| 0c20 | 00 00 69 04 00 00 00 69 05 00 00 00 69 06 00 00 00 4e 28 0e 00 00 00 52 0d 00 00 00 74 09 00 00 | ..i....i....i....N(....R....t... |
| 0c40 | 00 63 6f 6e 66 6c 69 63 74 73 74 03 00 00 00 6c 65 6e 52 11 00 00 00 74 08 00 00 00 65 6e 64 73 | .conflictst....lenR....t....ends |
| 0c60 | 77 69 74 68 52 01 00 00 00 74 0d 00 00 00 6d 65 72 67 65 5f 72 65 67 69 6f 6e 73 52 10 00 00 00 | withR....t....merge_regionsR.... |
| 0c80 | 74 17 00 00 00 72 65 70 72 6f 63 65 73 73 5f 6d 65 72 67 65 5f 72 65 67 69 6f 6e 73 74 05 00 00 | t....reprocess_merge_regionst... |
| 0ca0 | 00 72 61 6e 67 65 52 20 00 00 00 52 14 00 00 00 52 07 00 00 00 74 0a 00 00 00 56 61 6c 75 65 45 | .rangeR....R....R....t....ValueE |
| 0cc0 | 72 72 6f 72 28 0e 00 00 00 52 21 00 00 00 74 06 00 00 00 6e 61 6d 65 5f 61 74 06 00 00 00 6e 61 | rror(....R!...t....name_at....na |
| 0ce0 | 6d 65 5f 62 74 09 00 00 00 6e 61 6d 65 5f 62 61 73 65 74 0c 00 00 00 73 74 61 72 74 5f 6d 61 72 | me_bt....name_baset....start_mar |
| 0d00 | 6b 65 72 74 0a 00 00 00 6d 69 64 5f 6d 61 72 6b 65 72 74 0a 00 00 00 65 6e 64 5f 6d 61 72 6b 65 | kert....mid_markert....end_marke |
| 0d20 | 72 74 0b 00 00 00 62 61 73 65 5f 6d 61 72 6b 65 72 74 09 00 00 00 72 65 70 72 6f 63 65 73 73 74 | rt....base_markert....reprocesst |
| 0d40 | 07 00 00 00 6e 65 77 6c 69 6e 65 52 2a 00 00 00 74 01 00 00 00 74 74 04 00 00 00 77 68 61 74 74 | ....newlineR*...t....tt....whatt |
| 0d60 | 01 00 00 00 69 28 00 00 00 00 28 00 00 00 00 73 28 00 00 00 2f 73 79 73 2f 6c 69 62 2f 70 79 74 | ....i(....(....s(.../sys/lib/pyt |
| 0d80 | 68 6f 6e 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 74 0b 00 00 | hon/mercurial/simplemerge.pyt... |
| 0da0 | 00 6d 65 72 67 65 5f 6c 69 6e 65 73 50 00 00 00 73 64 00 00 00 00 0b 09 01 06 01 16 01 17 01 0a | .merge_linesP...sd.............. |
| 0dc0 | 01 17 01 0e 01 0e 01 0d 01 07 01 12 01 07 01 12 01 0e 01 12 01 0c 01 0d 01 13 01 07 00 06 01 0a | ................................ |
| 0de0 | 01 0d 01 18 00 06 01 14 01 1a 01 18 00 06 01 14 01 0d 01 18 00 06 01 14 01 0d 01 09 01 09 01 18 | ................................ |
| 0e00 | 00 06 01 10 01 0d 01 09 01 18 00 06 01 14 01 09 01 18 00 06 01 10 01 0d 02 63 01 00 00 00 04 00 | .........................c...... |
| 0e20 | 00 00 07 00 00 00 63 00 00 00 73 93 01 00 00 78 8c 01 7c 00 00 69 00 00 83 00 00 44 5d 7e 01 7d | ......c...s....x..|..i.....D]~.} |
| 0e40 | 01 00 7c 01 00 64 01 00 19 7d 02 00 7c 02 00 64 02 00 6a 02 00 6f 36 00 01 78 5e 01 74 01 00 7c | ..|..d...}..|..d..j..o6..x^.t..| |
| 0e60 | 01 00 64 03 00 19 7c 01 00 64 04 00 19 83 02 00 44 5d 16 00 7d 03 00 64 05 00 7c 00 00 69 02 00 | ..d...|..d......D]..}..d..|..i.. |
| 0e80 | 7c 03 00 19 17 56 01 71 42 00 57 71 0d 00 01 7c 02 00 64 06 00 6a 02 00 70 0d 00 01 7c 02 00 64 | |....V.qB.Wq...|..d..j..p...|..d |
| 0ea0 | 07 00 6a 02 00 6f 3e 00 01 78 0e 01 74 01 00 7c 01 00 64 03 00 19 7c 01 00 64 04 00 19 83 02 00 | ..j..o>..x..t..|..d...|..d...... |
| 0ec0 | 44 5d 1e 00 7d 03 00 7c 02 00 64 01 00 19 64 08 00 17 7c 00 00 69 03 00 7c 03 00 19 17 56 01 71 | D]..}..|..d...d...|..i..|....V.q |
| 0ee0 | 92 00 57 71 0d 00 01 7c 02 00 64 09 00 6a 02 00 6f 36 00 01 78 c3 00 74 01 00 7c 01 00 64 03 00 | ..Wq...|..d..j..o6..x..t..|..d.. |
| 0f00 | 19 7c 01 00 64 04 00 19 83 02 00 44 5d 16 00 7d 03 00 64 0a 00 7c 00 00 69 04 00 7c 03 00 19 17 | .|..d......D]..}..d..|..i..|.... |
| 0f20 | 56 01 71 dd 00 57 71 0d 00 01 7c 02 00 64 0b 00 6a 02 00 6f 77 00 01 64 0c 00 56 01 78 2f 00 74 | V.q..Wq...|..d..j..ow..d..V.x/.t |
| 0f40 | 01 00 7c 01 00 64 0d 00 19 7c 01 00 64 0e 00 19 83 02 00 44 5d 16 00 7d 03 00 64 0f 00 7c 00 00 | ..|..d...|..d......D]..}..d..|.. |
| 0f60 | 69 03 00 7c 03 00 19 17 56 01 71 25 01 57 64 10 00 56 01 78 2f 00 74 01 00 7c 01 00 64 11 00 19 | i..|....V.q%.Wd..V.x/.t..|..d... |
| 0f80 | 7c 01 00 64 12 00 19 83 02 00 44 5d 16 00 7d 03 00 64 13 00 7c 00 00 69 04 00 7c 03 00 19 17 56 | |..d......D]..}..d..|..i..|....V |
| 0fa0 | 01 71 5c 01 57 64 14 00 56 01 71 0d 00 01 74 05 00 7c 02 00 83 01 00 82 01 00 71 0d 00 57 64 15 | .q\.Wd..V.q...t..|........q..Wd. |
| 0fc0 | 00 53 28 16 00 00 00 73 68 00 00 00 52 65 74 75 72 6e 20 6d 65 72 67 65 20 77 69 74 68 20 63 6f | .S(....sh...Return.merge.with.co |
| 0fe0 | 6e 66 6c 69 63 74 73 2c 20 73 68 6f 77 69 6e 67 20 6f 72 69 67 69 6e 20 6f 66 20 6c 69 6e 65 73 | nflicts,.showing.origin.of.lines |
| 1000 | 2e 0a 0a 20 20 20 20 20 20 20 20 4d 6f 73 74 20 75 73 65 66 75 6c 20 66 6f 72 20 64 65 62 75 67 | ...........Most.useful.for.debug |
| 1020 | 67 69 6e 67 20 6d 65 72 67 65 2e 0a 20 20 20 20 20 20 20 20 69 00 00 00 00 52 24 00 00 00 69 01 | ging.merge..........i....R$...i. |
| 1040 | 00 00 00 69 02 00 00 00 73 04 00 00 00 75 20 7c 20 52 11 00 00 00 52 25 00 00 00 73 03 00 00 00 | ...i....s....u.|.R....R%...s.... |
| 1060 | 20 7c 20 52 14 00 00 00 73 04 00 00 00 62 20 7c 20 52 26 00 00 00 73 05 00 00 00 3c 3c 3c 3c 0a | .|.R....s....b.|.R&...s....<<<<. |
| 1080 | 69 03 00 00 00 69 04 00 00 00 73 04 00 00 00 41 20 7c 20 73 05 00 00 00 2d 2d 2d 2d 0a 69 05 00 | i....i....s....A.|.s....----.i.. |
| 10a0 | 00 00 69 06 00 00 00 73 04 00 00 00 42 20 7c 20 73 05 00 00 00 3e 3e 3e 3e 0a 4e 28 06 00 00 00 | ..i....s....B.|.s....>>>>.N(.... |
| 10c0 | 52 2a 00 00 00 52 2c 00 00 00 52 20 00 00 00 52 11 00 00 00 52 14 00 00 00 52 2d 00 00 00 28 04 | R*...R,...R....R....R....R-...(. |
| 10e0 | 00 00 00 52 21 00 00 00 52 37 00 00 00 52 38 00 00 00 52 39 00 00 00 28 00 00 00 00 28 00 00 00 | ...R!...R7...R8...R9...(....(... |
| 1100 | 00 73 28 00 00 00 2f 73 79 73 2f 6c 69 62 2f 70 79 74 68 6f 6e 2f 6d 65 72 63 75 72 69 61 6c 2f | .s(.../sys/lib/python/mercurial/ |
| 1120 | 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 74 0f 00 00 00 6d 65 72 67 65 5f 61 6e 6e 6f 74 61 74 | simplemerge.pyt....merge_annotat |
| 1140 | 65 64 88 00 00 00 73 34 00 00 00 00 05 0d 00 06 01 0a 01 0d 01 18 00 06 01 18 01 1a 01 18 00 06 | ed....s4........................ |
| 1160 | 01 20 01 0d 01 18 00 06 01 18 01 0d 01 05 01 18 00 06 01 14 01 05 01 18 00 06 01 14 01 09 02 63 | ...............................c |
| 1180 | 01 00 00 00 03 00 00 00 0a 00 00 00 63 00 00 00 73 20 01 00 00 78 19 01 7c 00 00 69 00 00 83 00 | ............c...s....x..|..i.... |
| 11a0 | 00 44 5d 0b 01 7d 01 00 7c 01 00 64 01 00 19 7d 02 00 7c 02 00 64 02 00 6a 02 00 6f 21 00 01 7c | .D]..}..|..d...}..|..d..j..o!..| |
| 11c0 | 02 00 7c 00 00 69 01 00 7c 01 00 64 03 00 19 7c 01 00 64 04 00 19 21 66 02 00 56 01 71 0d 00 01 | ..|..i..|..d...|..d...!f..V.q... |
| 11e0 | 7c 02 00 64 05 00 6a 02 00 70 0d 00 01 7c 02 00 64 06 00 6a 02 00 6f 21 00 01 7c 02 00 7c 00 00 | |..d..j..p...|..d..j..o!..|..|.. |
| 1200 | 69 02 00 7c 01 00 64 03 00 19 7c 01 00 64 04 00 19 21 66 02 00 56 01 71 0d 00 01 7c 02 00 64 07 | i..|..d...|..d...!f..V.q...|..d. |
| 1220 | 00 6a 02 00 6f 21 00 01 7c 02 00 7c 00 00 69 03 00 7c 01 00 64 03 00 19 7c 01 00 64 04 00 19 21 | .j..o!..|..|..i..|..d...|..d...! |
| 1240 | 66 02 00 56 01 71 0d 00 01 7c 02 00 64 08 00 6a 02 00 6f 4b 00 01 7c 02 00 7c 00 00 69 01 00 7c | f..V.q...|..d..j..oK..|..|..i..| |
| 1260 | 01 00 64 03 00 19 7c 01 00 64 04 00 19 21 7c 00 00 69 02 00 7c 01 00 64 09 00 19 7c 01 00 64 0a | ..d...|..d...!|..i..|..d...|..d. |
| 1280 | 00 19 21 7c 00 00 69 03 00 7c 01 00 64 0b 00 19 7c 01 00 64 0c 00 19 21 66 04 00 56 01 71 0d 00 | ..!|..i..|..d...|..d...!f..V.q.. |
| 12a0 | 01 74 04 00 7c 02 00 83 01 00 82 01 00 71 0d 00 57 64 0d 00 53 28 0e 00 00 00 73 ab 01 00 00 59 | .t..|........q..Wd..S(....s....Y |
| 12c0 | 69 65 6c 64 20 73 65 71 75 65 6e 63 65 20 6f 66 20 6c 69 6e 65 20 67 72 6f 75 70 73 2e 20 20 45 | ield.sequence.of.line.groups...E |
| 12e0 | 61 63 68 20 6f 6e 65 20 69 73 20 61 20 74 75 70 6c 65 3a 0a 0a 20 20 20 20 20 20 20 20 27 75 6e | ach.one.is.a.tuple:..........'un |
| 1300 | 63 68 61 6e 67 65 64 27 2c 20 6c 69 6e 65 73 0a 20 20 20 20 20 20 20 20 20 20 20 20 20 4c 69 6e | changed',.lines..............Lin |
| 1320 | 65 73 20 75 6e 63 68 61 6e 67 65 64 20 66 72 6f 6d 20 62 61 73 65 0a 0a 20 20 20 20 20 20 20 20 | es.unchanged.from.base.......... |
| 1340 | 27 61 27 2c 20 6c 69 6e 65 73 0a 20 20 20 20 20 20 20 20 20 20 20 20 20 4c 69 6e 65 73 20 74 61 | 'a',.lines..............Lines.ta |
| 1360 | 6b 65 6e 20 66 72 6f 6d 20 61 0a 0a 20 20 20 20 20 20 20 20 27 73 61 6d 65 27 2c 20 6c 69 6e 65 | ken.from.a..........'same',.line |
| 1380 | 73 0a 20 20 20 20 20 20 20 20 20 20 20 20 20 4c 69 6e 65 73 20 74 61 6b 65 6e 20 66 72 6f 6d 20 | s..............Lines.taken.from. |
| 13a0 | 61 20 28 61 6e 64 20 65 71 75 61 6c 20 74 6f 20 62 29 0a 0a 20 20 20 20 20 20 20 20 27 62 27 2c | a.(and.equal.to.b)..........'b', |
| 13c0 | 20 6c 69 6e 65 73 0a 20 20 20 20 20 20 20 20 20 20 20 20 20 4c 69 6e 65 73 20 74 61 6b 65 6e 20 | .lines..............Lines.taken. |
| 13e0 | 66 72 6f 6d 20 62 0a 0a 20 20 20 20 20 20 20 20 27 63 6f 6e 66 6c 69 63 74 27 2c 20 62 61 73 65 | from.b..........'conflict',.base |
| 1400 | 5f 6c 69 6e 65 73 2c 20 61 5f 6c 69 6e 65 73 2c 20 62 5f 6c 69 6e 65 73 0a 20 20 20 20 20 20 20 | _lines,.a_lines,.b_lines........ |
| 1420 | 20 20 20 20 20 20 4c 69 6e 65 73 20 66 72 6f 6d 20 62 61 73 65 20 77 65 72 65 20 63 68 61 6e 67 | ......Lines.from.base.were.chang |
| 1440 | 65 64 20 74 6f 20 65 69 74 68 65 72 20 61 20 6f 72 20 62 20 61 6e 64 20 63 6f 6e 66 6c 69 63 74 | ed.to.either.a.or.b.and.conflict |
| 1460 | 2e 0a 20 20 20 20 20 20 20 20 69 00 00 00 00 52 24 00 00 00 69 01 00 00 00 69 02 00 00 00 52 11 | ..........i....R$...i....i....R. |
| 1480 | 00 00 00 52 25 00 00 00 52 14 00 00 00 52 26 00 00 00 69 03 00 00 00 69 04 00 00 00 69 05 00 00 | ...R%...R....R&...i....i....i... |
| 14a0 | 00 69 06 00 00 00 4e 28 05 00 00 00 52 2a 00 00 00 52 20 00 00 00 52 11 00 00 00 52 14 00 00 00 | .i....N(....R*...R....R....R.... |
| 14c0 | 52 2d 00 00 00 28 03 00 00 00 52 21 00 00 00 52 37 00 00 00 52 38 00 00 00 28 00 00 00 00 28 00 | R-...(....R!...R7...R8...(....(. |
| 14e0 | 00 00 00 73 28 00 00 00 2f 73 79 73 2f 6c 69 62 2f 70 79 74 68 6f 6e 2f 6d 65 72 63 75 72 69 61 | ...s(.../sys/lib/python/mercuria |
| 1500 | 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 74 0c 00 00 00 6d 65 72 67 65 5f 67 72 6f 75 70 | l/simplemerge.pyt....merge_group |
| 1520 | 73 a3 00 00 00 73 1e 00 00 00 00 12 0d 00 06 01 0a 01 0d 01 21 01 1a 01 21 01 0d 01 21 01 0d 01 | s....s..............!...!...!... |
| 1540 | 03 01 15 01 15 01 1e 02 63 01 00 00 00 11 00 00 00 08 00 00 00 63 00 00 00 73 6c 02 00 00 64 01 | ........c............c...sl...d. |
| 1560 | 00 04 7d 01 00 04 7d 02 00 7d 03 00 78 57 02 7c 00 00 69 00 00 83 00 00 44 5d 49 02 5c 06 00 7d | ..}...}..}..xW.|..i.....D]I.\..} |
| 1580 | 04 00 7d 05 00 7d 06 00 7d 07 00 7d 08 00 7d 09 00 7c 05 00 7c 04 00 18 7d 0a 00 7c 0a 00 64 01 | ..}..}..}..}..}..|..|...}..|..d. |
| 15a0 | 00 6a 05 00 70 07 00 01 74 01 00 82 01 00 01 7c 0a 00 7c 07 00 7c 06 00 18 6a 02 00 70 07 00 01 | .j..p...t......|..|..|...j..p... |
| 15c0 | 74 01 00 82 01 00 01 7c 0a 00 7c 09 00 7c 08 00 18 6a 02 00 70 07 00 01 74 01 00 82 01 00 01 7c | t......|..|..|...j..p...t......| |
| 15e0 | 06 00 7c 02 00 18 7d 0b 00 7c 08 00 7c 03 00 18 7d 0c 00 7c 04 00 7c 01 00 18 7d 0d 00 7c 0b 00 | ..|...}..|..|...}..|..|...}..|.. |
| 1600 | 64 01 00 6a 05 00 70 07 00 01 74 01 00 82 01 00 01 7c 0c 00 64 01 00 6a 05 00 70 07 00 01 74 01 | d..j..p...t......|..d..j..p...t. |
| 1620 | 00 82 01 00 01 7c 0d 00 64 01 00 6a 05 00 70 07 00 01 74 01 00 82 01 00 01 7c 0b 00 70 07 00 01 | .....|..d..j..p...t......|..p... |
| 1640 | 7c 0c 00 6f 08 01 01 74 02 00 7c 00 00 69 03 00 7c 02 00 7c 06 00 7c 00 00 69 04 00 7c 01 00 7c | |..o...t..|..i..|..|..|..i..|..| |
| 1660 | 04 00 83 06 00 7d 0e 00 74 02 00 7c 00 00 69 05 00 7c 03 00 7c 08 00 7c 00 00 69 04 00 7c 01 00 | .....}..t..|..i..|..|..|..i..|.. |
| 1680 | 7c 04 00 83 06 00 7d 0f 00 74 02 00 7c 00 00 69 03 00 7c 02 00 7c 06 00 7c 00 00 69 05 00 7c 03 | |.....}..t..|..i..|..|..|..i..|. |
| 16a0 | 00 7c 08 00 83 06 00 7d 10 00 7c 10 00 6f 12 00 01 64 02 00 7c 02 00 7c 06 00 66 03 00 56 01 6e | .|.....}..|..o...d..|..|..f..V.n |
| 16c0 | 7d 00 01 7c 0e 00 6f 1a 00 01 7c 0f 00 0c 6f 12 00 01 64 03 00 7c 03 00 7c 08 00 66 03 00 56 01 | }..|..o...|...o...d..|..|..f..V. |
| 16e0 | 6e 5c 00 01 7c 0f 00 6f 1a 00 01 7c 0e 00 0c 6f 12 00 01 64 04 00 7c 02 00 7c 06 00 66 03 00 56 | n\..|..o...|...o...d..|..|..f..V |
| 1700 | 01 6e 3b 00 01 7c 0e 00 0c 6f 26 00 01 7c 0f 00 0c 6f 1e 00 01 64 05 00 7c 01 00 7c 04 00 7c 02 | .n;..|...o&..|...o...d..|..|..|. |
| 1720 | 00 7c 06 00 7c 03 00 7c 08 00 66 07 00 56 01 6e 0d 00 01 74 01 00 64 06 00 83 01 00 82 01 00 7c | .|..|..|..f..V.n...t..d........| |
| 1740 | 06 00 7d 02 00 7c 08 00 7d 03 00 6e 01 00 01 7c 04 00 7d 01 00 7c 0a 00 64 01 00 6a 04 00 6f 60 | ..}..|..}..n...|..}..|..d..j..o` |
| 1760 | 00 01 7c 02 00 7c 06 00 6a 02 00 70 07 00 01 74 01 00 82 01 00 01 7c 03 00 7c 08 00 6a 02 00 70 | ..|..|..j..p...t......|..|..j..p |
| 1780 | 07 00 01 74 01 00 82 01 00 01 7c 01 00 7c 04 00 6a 02 00 70 07 00 01 74 01 00 82 01 00 01 64 07 | ...t......|..|..j..p...t......d. |
| 17a0 | 00 7c 04 00 7c 05 00 66 03 00 56 01 7c 05 00 7d 01 00 7c 07 00 7d 02 00 7c 09 00 7d 03 00 71 1b | .|..|..f..V.|..}..|..}..|..}..q. |
| 17c0 | 00 01 71 1b 00 57 64 08 00 53 28 09 00 00 00 73 70 03 00 00 52 65 74 75 72 6e 20 73 65 71 75 65 | ..q..Wd..S(....sp...Return.seque |
| 17e0 | 6e 63 65 73 20 6f 66 20 6d 61 74 63 68 69 6e 67 20 61 6e 64 20 63 6f 6e 66 6c 69 63 74 69 6e 67 | nces.of.matching.and.conflicting |
| 1800 | 20 72 65 67 69 6f 6e 73 2e 0a 0a 20 20 20 20 20 20 20 20 54 68 69 73 20 72 65 74 75 72 6e 73 20 | .regions...........This.returns. |
| 1820 | 74 75 70 6c 65 73 2c 20 77 68 65 72 65 20 74 68 65 20 66 69 72 73 74 20 76 61 6c 75 65 20 73 61 | tuples,.where.the.first.value.sa |
| 1840 | 79 73 20 77 68 61 74 20 6b 69 6e 64 20 77 65 0a 20 20 20 20 20 20 20 20 68 61 76 65 3a 0a 0a 20 | ys.what.kind.we.........have:... |
| 1860 | 20 20 20 20 20 20 20 27 75 6e 63 68 61 6e 67 65 64 27 2c 20 73 74 61 72 74 2c 20 65 6e 64 0a 20 | .......'unchanged',.start,.end.. |
| 1880 | 20 20 20 20 20 20 20 20 20 20 20 20 54 61 6b 65 20 61 20 72 65 67 69 6f 6e 20 6f 66 20 62 61 73 | ............Take.a.region.of.bas |
| 18a0 | 65 5b 73 74 61 72 74 3a 65 6e 64 5d 0a 0a 20 20 20 20 20 20 20 20 27 73 61 6d 65 27 2c 20 61 73 | e[start:end]..........'same',.as |
| 18c0 | 74 61 72 74 2c 20 61 65 6e 64 0a 20 20 20 20 20 20 20 20 20 20 20 20 20 62 20 61 6e 64 20 61 20 | tart,.aend..............b.and.a. |
| 18e0 | 61 72 65 20 64 69 66 66 65 72 65 6e 74 20 66 72 6f 6d 20 62 61 73 65 20 62 75 74 20 67 69 76 65 | are.different.from.base.but.give |
| 1900 | 20 74 68 65 20 73 61 6d 65 20 72 65 73 75 6c 74 0a 0a 20 20 20 20 20 20 20 20 27 61 27 2c 20 73 | .the.same.result..........'a',.s |
| 1920 | 74 61 72 74 2c 20 65 6e 64 0a 20 20 20 20 20 20 20 20 20 20 20 20 20 4e 6f 6e 2d 63 6c 61 73 68 | tart,.end..............Non-clash |
| 1940 | 69 6e 67 20 69 6e 73 65 72 74 69 6f 6e 20 66 72 6f 6d 20 61 5b 73 74 61 72 74 3a 65 6e 64 5d 0a | ing.insertion.from.a[start:end]. |
| 1960 | 0a 20 20 20 20 20 20 20 20 4d 65 74 68 6f 64 20 69 73 20 61 73 20 66 6f 6c 6c 6f 77 73 3a 0a 0a | .........Method.is.as.follows:.. |
| 1980 | 20 20 20 20 20 20 20 20 54 68 65 20 74 77 6f 20 73 65 71 75 65 6e 63 65 73 20 61 6c 69 67 6e 20 | ........The.two.sequences.align. |
| 19a0 | 6f 6e 6c 79 20 6f 6e 20 72 65 67 69 6f 6e 73 20 77 68 69 63 68 20 6d 61 74 63 68 20 74 68 65 20 | only.on.regions.which.match.the. |
| 19c0 | 62 61 73 65 0a 20 20 20 20 20 20 20 20 61 6e 64 20 62 6f 74 68 20 64 65 73 63 65 6e 64 65 6e 74 | base.........and.both.descendent |
| 19e0 | 73 2e 20 20 54 68 65 73 65 20 61 72 65 20 66 6f 75 6e 64 20 62 79 20 64 6f 69 6e 67 20 61 20 74 | s...These.are.found.by.doing.a.t |
| 1a00 | 77 6f 2d 77 61 79 20 64 69 66 66 0a 20 20 20 20 20 20 20 20 6f 66 20 65 61 63 68 20 6f 6e 65 20 | wo-way.diff.........of.each.one. |
| 1a20 | 61 67 61 69 6e 73 74 20 74 68 65 20 62 61 73 65 2c 20 61 6e 64 20 74 68 65 6e 20 66 69 6e 64 69 | against.the.base,.and.then.findi |
| 1a40 | 6e 67 20 74 68 65 0a 20 20 20 20 20 20 20 20 69 6e 74 65 72 73 65 63 74 69 6f 6e 73 20 62 65 74 | ng.the.........intersections.bet |
| 1a60 | 77 65 65 6e 20 74 68 6f 73 65 20 72 65 67 69 6f 6e 73 2e 20 20 54 68 65 73 65 20 22 73 79 6e 63 | ween.those.regions...These."sync |
| 1a80 | 20 72 65 67 69 6f 6e 73 22 0a 20 20 20 20 20 20 20 20 61 72 65 20 62 79 20 64 65 66 69 6e 69 74 | .regions".........are.by.definit |
| 1aa0 | 69 6f 6e 20 75 6e 63 68 61 6e 67 65 64 20 69 6e 20 62 6f 74 68 20 61 6e 64 20 65 61 73 69 6c 79 | ion.unchanged.in.both.and.easily |
| 1ac0 | 20 64 65 61 6c 74 20 77 69 74 68 2e 0a 0a 20 20 20 20 20 20 20 20 54 68 65 20 72 65 67 69 6f 6e | .dealt.with...........The.region |
| 1ae0 | 73 20 69 6e 20 62 65 74 77 65 65 6e 20 63 61 6e 20 62 65 20 69 6e 20 61 6e 79 20 6f 66 20 74 68 | s.in.between.can.be.in.any.of.th |
| 1b00 | 72 65 65 20 63 61 73 65 73 3a 0a 20 20 20 20 20 20 20 20 63 6f 6e 66 6c 69 63 74 65 64 2c 20 6f | ree.cases:.........conflicted,.o |
| 1b20 | 72 20 63 68 61 6e 67 65 64 20 6f 6e 20 6f 6e 6c 79 20 6f 6e 65 20 73 69 64 65 2e 0a 20 20 20 20 | r.changed.on.only.one.side...... |
| 1b40 | 20 20 20 20 69 00 00 00 00 52 25 00 00 00 52 14 00 00 00 52 11 00 00 00 52 26 00 00 00 73 23 00 | ....i....R%...R....R....R&...s#. |
| 1b60 | 00 00 63 61 6e 27 74 20 68 61 6e 64 6c 65 20 61 3d 62 3d 62 61 73 65 20 62 75 74 20 75 6e 6d 61 | ..can't.handle.a=b=base.but.unma |
| 1b80 | 74 63 68 65 64 52 24 00 00 00 4e 28 06 00 00 00 74 11 00 00 00 66 69 6e 64 5f 73 79 6e 63 5f 72 | tchedR$...N(....t....find_sync_r |
| 1ba0 | 65 67 69 6f 6e 73 52 04 00 00 00 52 19 00 00 00 52 11 00 00 00 52 20 00 00 00 52 14 00 00 00 28 | egionsR....R....R....R....R....( |
| 1bc0 | 11 00 00 00 52 21 00 00 00 74 02 00 00 00 69 7a 52 17 00 00 00 52 18 00 00 00 74 06 00 00 00 7a | ....R!...t....izR....R....t....z |
| 1be0 | 6d 61 74 63 68 74 04 00 00 00 7a 65 6e 64 74 06 00 00 00 61 6d 61 74 63 68 52 13 00 00 00 74 06 | matcht....zendt....amatchR....t. |
| 1c00 | 00 00 00 62 6d 61 74 63 68 52 16 00 00 00 74 08 00 00 00 6d 61 74 63 68 6c 65 6e 74 05 00 00 00 | ...bmatchR....t....matchlent.... |
| 1c20 | 6c 65 6e 5f 61 74 05 00 00 00 6c 65 6e 5f 62 74 08 00 00 00 6c 65 6e 5f 62 61 73 65 74 07 00 00 | len_at....len_bt....len_baset... |
| 1c40 | 00 65 71 75 61 6c 5f 61 74 07 00 00 00 65 71 75 61 6c 5f 62 52 25 00 00 00 28 00 00 00 00 28 00 | .equal_at....equal_bR%...(....(. |
| 1c60 | 00 00 00 73 28 00 00 00 2f 73 79 73 2f 6c 69 62 2f 70 79 74 68 6f 6e 2f 6d 65 72 63 75 72 69 61 | ...s(.../sys/lib/python/mercuria |
| 1c80 | 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 52 2a 00 00 00 c5 00 00 00 73 50 00 00 00 00 1c | l/simplemerge.pyR*.......sP..... |
| 1ca0 | 0e 02 0d 00 18 03 0a 01 14 01 18 01 18 02 0a 01 0a 01 0a 01 14 01 14 01 14 04 0e 02 0f 01 12 01 | ................................ |
| 1cc0 | 0f 01 12 01 0f 01 12 02 07 01 12 01 0f 01 12 01 0f 01 12 01 10 01 1e 02 0c 02 06 01 0a 01 06 06 | ................................ |
| 1ce0 | 0d 01 14 01 14 01 14 02 0e 01 06 01 06 01 63 02 00 00 00 13 00 00 00 0b 00 00 00 63 00 00 00 73 | ..............c............c...s |
| 1d00 | 51 01 00 00 78 4a 01 7c 01 00 44 5d 42 01 7d 02 00 7c 02 00 64 01 00 19 64 02 00 6a 03 00 6f 0c | Q...xJ.|..D]B.}..|..d...d..j..o. |
| 1d20 | 00 01 7c 02 00 56 01 71 07 00 6e 01 00 01 7c 02 00 5c 07 00 7d 03 00 7d 04 00 7d 05 00 7d 06 00 | ..|..V.q..n...|..\..}..}..}..}.. |
| 1d40 | 7d 07 00 7d 08 00 7d 09 00 7c 00 00 69 00 00 7c 06 00 7c 07 00 21 7d 0a 00 7c 00 00 69 01 00 7c | }..}..}..|..i..|..|..!}..|..i..| |
| 1d60 | 08 00 7c 09 00 21 7d 0b 00 74 02 00 69 03 00 64 03 00 69 04 00 7c 0a 00 83 01 00 64 03 00 69 04 | ..|..!}..t..i..d..i..|.....d..i. |
| 1d80 | 00 7c 0b 00 83 01 00 83 02 00 7d 0c 00 7c 06 00 7d 0d 00 7c 08 00 7d 0e 00 78 83 00 7c 0c 00 64 | .|........}..|..}..|..}..x..|..d |
| 1da0 | 04 00 20 44 5d 77 00 5c 03 00 7d 0f 00 7d 10 00 7d 11 00 7c 0f 00 7c 06 00 37 7d 0f 00 7c 10 00 | ...D]w.\..}..}..}..|..|..7}..|.. |
| 1dc0 | 7c 08 00 37 7d 10 00 7c 00 00 69 05 00 7c 0d 00 7c 0f 00 7c 0e 00 7c 10 00 83 04 00 7d 12 00 7c | |..7}..|..i..|..|..|..|.....}..| |
| 1de0 | 12 00 64 06 00 6a 09 00 6f 09 00 01 7c 12 00 56 01 6e 01 00 01 64 05 00 7c 0f 00 7c 11 00 7c 0f | ..d..j..o...|..V.n...d..|..|..|. |
| 1e00 | 00 17 66 03 00 56 01 7c 0f 00 7c 11 00 17 7d 0d 00 7c 10 00 7c 11 00 17 7d 0e 00 71 a0 00 57 7c | ..f..V.|..|...}..|..|...}..q..W| |
| 1e20 | 00 00 69 05 00 7c 0d 00 7c 07 00 7c 0e 00 7c 09 00 83 04 00 7d 12 00 7c 12 00 64 06 00 6a 09 00 | ..i..|..|..|..|.....}..|..d..j.. |
| 1e40 | 6f 09 00 01 7c 12 00 56 01 71 07 00 01 71 07 00 57 64 06 00 53 28 07 00 00 00 73 98 00 00 00 57 | o...|..V.q...q..Wd..S(....s....W |
| 1e60 | 68 65 72 65 20 74 68 65 72 65 20 61 72 65 20 63 6f 6e 66 6c 69 63 74 20 72 65 67 69 6f 6e 73 2c | here.there.are.conflict.regions, |
| 1e80 | 20 72 65 6d 6f 76 65 20 74 68 65 20 61 67 72 65 65 64 20 6c 69 6e 65 73 2e 0a 0a 20 20 20 20 20 | .remove.the.agreed.lines........ |
| 1ea0 | 20 20 20 4c 69 6e 65 73 20 77 68 65 72 65 20 62 6f 74 68 20 41 20 61 6e 64 20 42 20 68 61 76 65 | ...Lines.where.both.A.and.B.have |
| 1ec0 | 20 6d 61 64 65 20 74 68 65 20 73 61 6d 65 20 63 68 61 6e 67 65 73 20 61 72 65 0a 20 20 20 20 20 | .made.the.same.changes.are...... |
| 1ee0 | 20 20 20 65 6c 69 6d 69 6e 61 74 65 64 2e 0a 20 20 20 20 20 20 20 20 69 00 00 00 00 52 26 00 00 | ...eliminated..........i....R&.. |
| 1f00 | 00 74 00 00 00 00 69 ff ff ff ff 52 25 00 00 00 4e 28 07 00 00 00 52 11 00 00 00 52 14 00 00 00 | .t....i....R%...N(....R....R.... |
| 1f20 | 52 1e 00 00 00 74 13 00 00 00 67 65 74 5f 6d 61 74 63 68 69 6e 67 5f 62 6c 6f 63 6b 73 74 04 00 | R....t....get_matching_blockst.. |
| 1f40 | 00 00 6a 6f 69 6e 74 0f 00 00 00 6d 69 73 6d 61 74 63 68 5f 72 65 67 69 6f 6e 52 07 00 00 00 28 | ..joint....mismatch_regionR....( |
| 1f60 | 13 00 00 00 52 21 00 00 00 52 2a 00 00 00 74 06 00 00 00 72 65 67 69 6f 6e 74 04 00 00 00 74 79 | ....R!...R*...t....regiont....ty |
| 1f80 | 70 65 52 3e 00 00 00 52 3f 00 00 00 52 17 00 00 00 52 41 00 00 00 52 18 00 00 00 52 42 00 00 00 | peR>...R?...R....RA...R....RB... |
| 1fa0 | 74 08 00 00 00 61 5f 72 65 67 69 6f 6e 74 08 00 00 00 62 5f 72 65 67 69 6f 6e 74 07 00 00 00 6d | t....a_regiont....b_regiont....m |
| 1fc0 | 61 74 63 68 65 73 74 06 00 00 00 6e 65 78 74 5f 61 74 06 00 00 00 6e 65 78 74 5f 62 74 09 00 00 | atchest....next_at....next_bt... |
| 1fe0 | 00 72 65 67 69 6f 6e 5f 69 61 74 09 00 00 00 72 65 67 69 6f 6e 5f 69 62 74 0a 00 00 00 72 65 67 | .region_iat....region_ibt....reg |
| 2000 | 69 6f 6e 5f 6c 65 6e 74 03 00 00 00 72 65 67 28 00 00 00 00 28 00 00 00 00 73 28 00 00 00 2f 73 | ion_lent....reg(....(....s(.../s |
| 2020 | 79 73 2f 6c 69 62 2f 70 79 74 68 6f 6e 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 | ys/lib/python/mercurial/simpleme |
| 2040 | 72 67 65 2e 70 79 52 2b 00 00 00 1a 01 00 00 73 34 00 00 00 00 06 07 00 06 01 11 01 05 01 07 01 | rge.pyR+.......s4............... |
| 2060 | 1b 01 10 01 10 01 12 01 12 01 06 01 06 01 0b 00 0f 01 0a 01 0a 01 0f 01 09 01 0d 01 09 01 12 01 | ................................ |
| 2080 | 0a 01 0e 01 18 01 0d 01 63 04 00 00 00 04 00 00 00 07 00 00 00 43 00 00 00 73 3b 00 00 00 7c 00 | ........c............C...s;...|. |
| 20a0 | 00 7c 01 00 6a 00 00 70 0d 00 01 7c 02 00 7c 03 00 6a 00 00 6f 1d 00 01 64 01 00 64 00 00 64 00 | .|..j..p...|..|..j..o...d..d..d. |
| 20c0 | 00 7c 00 00 7c 01 00 7c 02 00 7c 03 00 66 07 00 53 6e 01 00 01 64 00 00 53 28 02 00 00 00 4e 52 | .|..|..|..|..f..Sn...d..S(....NR |
| 20e0 | 26 00 00 00 28 01 00 00 00 52 07 00 00 00 28 04 00 00 00 52 52 00 00 00 52 54 00 00 00 52 53 00 | &...(....R....(....RR...RT...RS. |
| 2100 | 00 00 52 55 00 00 00 28 00 00 00 00 28 00 00 00 00 73 28 00 00 00 2f 73 79 73 2f 6c 69 62 2f 70 | ..RU...(....(....s(.../sys/lib/p |
| 2120 | 79 74 68 6f 6e 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 52 4c | ython/mercurial/simplemerge.pyRL |
| 2140 | 00 00 00 39 01 00 00 73 04 00 00 00 00 01 1a 01 63 01 00 00 00 16 00 00 00 0c 00 00 00 43 00 00 | ...9...s........c............C.. |
| 2160 | 00 73 75 02 00 00 64 01 00 04 7d 01 00 7d 02 00 74 00 00 69 01 00 7c 00 00 69 02 00 7c 00 00 69 | .su...d...}..}..t..i..|..i..|..i |
| 2180 | 03 00 83 02 00 7d 03 00 74 00 00 69 01 00 7c 00 00 69 02 00 7c 00 00 69 04 00 83 02 00 7d 04 00 | .....}..t..i..|..i..|..i.....}.. |
| 21a0 | 74 05 00 7c 03 00 83 01 00 7d 05 00 74 05 00 7c 04 00 83 01 00 7d 06 00 67 00 00 7d 07 00 78 ca | t..|.....}..t..|.....}..g..}..x. |
| 21c0 | 01 7c 01 00 7c 05 00 6a 00 00 6f bc 01 01 7c 02 00 7c 06 00 6a 00 00 6f af 01 01 7c 03 00 7c 01 | .|..|..j..o...|..|..j..o...|..|. |
| 21e0 | 00 19 5c 03 00 7d 08 00 7d 09 00 7d 0a 00 7c 04 00 7c 02 00 19 5c 03 00 7d 0b 00 7d 0c 00 7d 0d | ..\..}..}..}..|..|...\..}..}..}. |
| 2200 | 00 74 06 00 7c 08 00 7c 08 00 7c 0a 00 17 66 02 00 7c 0b 00 7c 0b 00 7c 0d 00 17 66 02 00 83 02 | .t..|..|..|...f..|..|..|...f.... |
| 2220 | 00 7d 0e 00 7c 0e 00 6f 2e 01 01 7c 0e 00 64 01 00 19 7d 0f 00 7c 0e 00 64 02 00 19 7d 10 00 7c | .}..|..o...|..d...}..|..d...}..| |
| 2240 | 10 00 7c 0f 00 18 7d 11 00 7c 11 00 7c 0a 00 6a 01 00 70 07 00 01 74 07 00 82 01 00 01 7c 11 00 | ..|...}..|..|..j..p...t......|.. |
| 2260 | 7c 0d 00 6a 01 00 70 07 00 01 74 07 00 82 01 00 01 7c 08 00 7c 0f 00 6a 01 00 70 07 00 01 74 07 | |..j..p...t......|..|..j..p...t. |
| 2280 | 00 82 01 00 01 7c 0b 00 7c 0f 00 6a 01 00 70 07 00 01 74 07 00 82 01 00 01 7c 09 00 7c 0f 00 7c | .....|..|..j..p...t......|..|..| |
| 22a0 | 08 00 18 17 7d 12 00 7c 0c 00 7c 0f 00 7c 0b 00 18 17 7d 13 00 7c 12 00 7c 11 00 17 7d 14 00 7c | ....}..|..|..|....}..|..|...}..| |
| 22c0 | 13 00 7c 11 00 17 7d 15 00 7c 00 00 69 08 00 7c 0f 00 7c 10 00 21 7c 00 00 69 09 00 7c 12 00 7c | ..|...}..|..i..|..|..!|..i..|..| |
| 22e0 | 14 00 21 6a 02 00 70 24 00 01 74 07 00 7c 00 00 69 08 00 7c 0f 00 7c 10 00 21 7c 00 00 69 09 00 | ..!j..p$..t..|..i..|..|..!|..i.. |
| 2300 | 7c 12 00 7c 14 00 21 66 02 00 82 02 00 01 7c 00 00 69 08 00 7c 0f 00 7c 10 00 21 7c 00 00 69 0a | |..|..!f......|..i..|..|..!|..i. |
| 2320 | 00 7c 13 00 7c 15 00 21 6a 02 00 70 07 00 01 74 07 00 82 01 00 01 7c 07 00 69 0b 00 7c 0f 00 7c | .|..|..!j..p...t......|..i..|..| |
| 2340 | 10 00 7c 12 00 7c 14 00 7c 13 00 7c 15 00 66 06 00 83 01 00 01 6e 01 00 01 7c 08 00 7c 0a 00 17 | ..|..|..|..|..f......n...|..|... |
| 2360 | 7c 0b 00 7c 0d 00 17 6a 00 00 6f 0e 00 01 7c 01 00 64 02 00 37 7d 01 00 71 5b 00 01 7c 02 00 64 | |..|...j..o...|..d..7}..q[..|..d |
| 2380 | 02 00 37 7d 02 00 71 5b 00 01 57 74 05 00 7c 00 00 69 08 00 83 01 00 7d 0f 00 74 05 00 7c 00 00 | ..7}..q[..Wt..|..i.....}..t..|.. |
| 23a0 | 69 09 00 83 01 00 7d 08 00 74 05 00 7c 00 00 69 0a 00 83 01 00 7d 0b 00 7c 07 00 69 0b 00 7c 0f | i.....}..t..|..i.....}..|..i..|. |
| 23c0 | 00 7c 0f 00 7c 08 00 7c 08 00 7c 0b 00 7c 0b 00 66 06 00 83 01 00 01 7c 07 00 53 28 03 00 00 00 | .|..|..|..|..|..f......|..S(.... |
| 23e0 | 73 db 00 00 00 52 65 74 75 72 6e 20 61 20 6c 69 73 74 20 6f 66 20 73 79 6e 63 20 72 65 67 69 6f | s....Return.a.list.of.sync.regio |
| 2400 | 6e 73 2c 20 77 68 65 72 65 20 62 6f 74 68 20 64 65 73 63 65 6e 64 65 6e 74 73 20 6d 61 74 63 68 | ns,.where.both.descendents.match |
| 2420 | 20 74 68 65 20 62 61 73 65 2e 0a 0a 20 20 20 20 20 20 20 20 47 65 6e 65 72 61 74 65 73 20 61 20 | .the.base...........Generates.a. |
| 2440 | 6c 69 73 74 20 6f 66 20 28 62 61 73 65 31 2c 20 62 61 73 65 32 2c 20 61 31 2c 20 61 32 2c 20 62 | list.of.(base1,.base2,.a1,.a2,.b |
| 2460 | 31 2c 20 62 32 29 2e 20 20 54 68 65 72 65 20 69 73 0a 20 20 20 20 20 20 20 20 61 6c 77 61 79 73 | 1,.b2)...There.is.........always |
| 2480 | 20 61 20 7a 65 72 6f 2d 6c 65 6e 67 74 68 20 73 79 6e 63 20 72 65 67 69 6f 6e 20 61 74 20 74 68 | .a.zero-length.sync.region.at.th |
| 24a0 | 65 20 65 6e 64 20 6f 66 20 61 6c 6c 20 74 68 65 20 66 69 6c 65 73 2e 0a 20 20 20 20 20 20 20 20 | e.end.of.all.the.files.......... |
| 24c0 | 69 00 00 00 00 69 01 00 00 00 28 0c 00 00 00 52 1e 00 00 00 52 4a 00 00 00 52 1b 00 00 00 52 1c | i....i....(....R....RJ...R....R. |
| 24e0 | 00 00 00 52 1d 00 00 00 52 28 00 00 00 52 0c 00 00 00 52 04 00 00 00 52 20 00 00 00 52 11 00 00 | ...R....R(...R....R....R....R... |
| 2500 | 00 52 14 00 00 00 74 06 00 00 00 61 70 70 65 6e 64 28 16 00 00 00 52 21 00 00 00 52 17 00 00 00 | .R....t....append(....R!...R.... |
| 2520 | 52 18 00 00 00 74 08 00 00 00 61 6d 61 74 63 68 65 73 74 08 00 00 00 62 6d 61 74 63 68 65 73 52 | R....t....amatchest....bmatchesR |
| 2540 | 44 00 00 00 52 45 00 00 00 74 02 00 00 00 73 6c 74 05 00 00 00 61 62 61 73 65 52 41 00 00 00 74 | D...RE...t....slt....abaseRA...t |
| 2560 | 04 00 00 00 61 6c 65 6e 74 05 00 00 00 62 62 61 73 65 52 42 00 00 00 74 04 00 00 00 62 6c 65 6e | ....alent....bbaseRB...t....blen |
| 2580 | 52 39 00 00 00 74 07 00 00 00 69 6e 74 62 61 73 65 74 06 00 00 00 69 6e 74 65 6e 64 74 06 00 00 | R9...t....intbaset....intendt... |
| 25a0 | 00 69 6e 74 6c 65 6e 74 04 00 00 00 61 73 75 62 74 04 00 00 00 62 73 75 62 52 13 00 00 00 52 16 | .intlent....asubt....bsubR....R. |
| 25c0 | 00 00 00 28 00 00 00 00 28 00 00 00 00 73 28 00 00 00 2f 73 79 73 2f 6c 69 62 2f 70 79 74 68 6f | ...(....(....s(.../sys/lib/pytho |
| 25e0 | 6e 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 52 3d 00 00 00 3e | n/mercurial/simplemerge.pyR=...> |
| 2600 | 01 00 00 73 48 00 00 00 00 07 0a 01 18 01 18 01 0c 01 0c 02 06 02 1d 01 13 01 13 04 23 01 07 01 | ...sH.......................#... |
| 2620 | 0a 01 0a 01 0a 04 14 01 14 01 14 01 14 02 0e 01 0e 01 0a 01 0a 02 24 01 21 02 28 02 0c 01 06 01 | ......................$.!.(..... |
| 2640 | 11 03 15 01 0e 02 0f 02 0f 01 0f 01 0f 01 1f 02 63 01 00 00 00 09 00 00 00 04 00 00 00 43 00 00 | ................c............C.. |
| 2660 | 00 73 e2 00 00 00 74 00 00 69 01 00 7c 00 00 69 02 00 7c 00 00 69 03 00 83 02 00 7d 01 00 74 00 | .s....t..i..|..i..|..i.....}..t. |
| 2680 | 00 69 01 00 7c 00 00 69 02 00 7c 00 00 69 04 00 83 02 00 7d 02 00 67 00 00 7d 03 00 78 a5 00 7c | .i..|..i..|..i.....}..g..}..x..| |
| 26a0 | 01 00 6f 9d 00 01 7c 02 00 6f 96 00 01 7c 01 00 64 01 00 19 64 01 00 19 7d 04 00 7c 04 00 7c 01 | ..o...|..o...|..d...d...}..|..|. |
| 26c0 | 00 64 01 00 19 64 02 00 19 17 7d 05 00 7c 02 00 64 01 00 19 64 01 00 19 7d 06 00 7c 06 00 7c 02 | .d...d....}..|..d...d...}..|..|. |
| 26e0 | 00 64 01 00 19 64 02 00 19 17 7d 07 00 74 05 00 7c 04 00 7c 05 00 66 02 00 7c 06 00 7c 07 00 66 | .d...d....}..t..|..|..f..|..|..f |
| 2700 | 02 00 83 02 00 7d 08 00 7c 08 00 6f 11 00 01 7c 03 00 69 06 00 7c 08 00 83 01 00 01 6e 01 00 01 | .....}..|..o...|..i..|......n... |
| 2720 | 7c 05 00 7c 07 00 6a 00 00 6f 0b 00 01 7c 01 00 64 01 00 3d 71 39 00 01 7c 02 00 64 01 00 3d 71 | |..|..j..o...|..d..=q9..|..d..=q |
| 2740 | 39 00 01 57 7c 03 00 53 28 03 00 00 00 73 38 00 00 00 52 65 74 75 72 6e 20 61 20 6c 69 73 74 20 | 9..W|..S(....s8...Return.a.list. |
| 2760 | 6f 66 20 72 61 6e 67 65 73 20 69 6e 20 62 61 73 65 20 74 68 61 74 20 61 72 65 20 6e 6f 74 20 63 | of.ranges.in.base.that.are.not.c |
| 2780 | 6f 6e 66 6c 69 63 74 65 64 2e 69 00 00 00 00 69 02 00 00 00 28 07 00 00 00 52 1e 00 00 00 52 4a | onflicted.i....i....(....R....RJ |
| 27a0 | 00 00 00 52 1b 00 00 00 52 1c 00 00 00 52 1d 00 00 00 52 0c 00 00 00 52 58 00 00 00 28 09 00 00 | ...R....R....R....R....RX...(... |
| 27c0 | 00 52 21 00 00 00 74 02 00 00 00 61 6d 74 02 00 00 00 62 6d 74 03 00 00 00 75 6e 63 74 02 00 00 | .R!...t....amt....bmt....unct... |
| 27e0 | 00 61 31 74 02 00 00 00 61 32 74 02 00 00 00 62 31 74 02 00 00 00 62 32 52 39 00 00 00 28 00 00 | .a1t....a2t....b1t....b2R9...(.. |
| 2800 | 00 00 28 00 00 00 00 73 28 00 00 00 2f 73 79 73 2f 6c 69 62 2f 70 79 74 68 6f 6e 2f 6d 65 72 63 | ..(....s(.../sys/lib/python/merc |
| 2820 | 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 74 11 00 00 00 66 69 6e 64 5f 75 6e | urial/simplemerge.pyt....find_un |
| 2840 | 63 6f 6e 66 6c 69 63 74 65 64 7b 01 00 00 73 1e 00 00 00 00 02 18 01 18 02 06 02 11 03 0e 01 12 | conflicted{...s................. |
| 2860 | 01 0e 01 12 01 1b 01 07 01 11 02 0d 01 0b 02 0c 02 4e 28 0f 00 00 00 52 02 00 00 00 52 03 00 00 | .................N(....R....R... |
| 2880 | 00 74 07 00 00 00 5f 5f 64 6f 63 5f 5f 52 07 00 00 00 52 22 00 00 00 52 0d 00 00 00 52 3a 00 00 | .t....__doc__R....R"...R....R:.. |
| 28a0 | 00 52 3b 00 00 00 52 3c 00 00 00 52 2a 00 00 00 52 2b 00 00 00 52 4c 00 00 00 74 0c 00 00 00 73 | .R;...R<...R*...R+...RL...t....s |
| 28c0 | 74 61 74 69 63 6d 65 74 68 6f 64 52 3d 00 00 00 52 6c 00 00 00 28 00 00 00 00 28 00 00 00 00 28 | taticmethodR=...Rl...(....(....( |
| 28e0 | 00 00 00 00 73 28 00 00 00 2f 73 79 73 2f 6c 69 62 2f 70 79 74 68 6f 6e 2f 6d 65 72 63 75 72 69 | ....s(.../sys/lib/python/mercuri |
| 2900 | 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 52 1a 00 00 00 3d 00 00 00 73 24 00 00 00 06 | al/simplemerge.pyR....=...s$.... |
| 2920 | 04 06 01 12 0f 03 01 03 01 03 01 03 01 03 01 03 01 03 01 0c 30 09 1b 09 22 09 55 09 1f 09 03 0c | ....................0...".U..... |
| 2940 | 02 09 3d 63 04 00 00 00 11 00 00 00 08 00 00 00 0b 00 00 00 73 c6 01 00 00 87 00 00 87 01 00 66 | ..=c................s..........f |
| 2960 | 02 00 64 01 00 86 00 00 7d 05 00 7c 01 00 7d 06 00 7c 03 00 7d 07 00 88 01 00 69 00 00 64 02 00 | ..d.....}..|..}..|..}.....i..d.. |
| 2980 | 67 00 00 83 02 00 7d 08 00 7c 08 00 6f 13 00 01 7c 08 00 69 01 00 64 03 00 83 01 00 7d 06 00 6e | g.....}..|..o...|..i..d.....}..n |
| 29a0 | 01 00 01 7c 08 00 6f 13 00 01 7c 08 00 69 01 00 64 03 00 83 01 00 7d 07 00 6e 01 00 01 7c 08 00 | ...|..o...|..i..d.....}..n...|.. |
| 29c0 | 6f 19 00 01 74 02 00 69 03 00 74 04 00 64 04 00 83 01 00 83 01 00 82 01 00 6e 01 00 01 7c 05 00 | o...t..i..t..d...........n...|.. |
| 29e0 | 7c 01 00 83 01 00 7d 09 00 7c 05 00 7c 02 00 83 01 00 7d 0a 00 7c 05 00 7c 03 00 83 01 00 7d 0b | |.....}..|..|.....}..|..|.....}. |
| 2a00 | 00 74 05 00 69 06 00 69 07 00 7c 01 00 83 01 00 7d 01 00 88 01 00 69 00 00 64 05 00 83 01 00 70 | .t..i..i..|.....}.....i..d.....p |
| 2a20 | 40 00 01 74 02 00 69 08 00 74 05 00 69 06 00 69 09 00 7c 01 00 83 01 00 83 01 00 7d 0c 00 7c 0c | @..t..i..t..i..i..|........}..|. |
| 2a40 | 00 74 05 00 69 06 00 69 0a 00 7c 01 00 83 01 00 64 06 00 64 07 00 74 0b 00 83 02 01 7d 0d 00 6e | .t..i..i..|.....d..d..t.....}..n |
| 2a60 | 0a 00 01 74 0c 00 69 0d 00 7d 0d 00 88 01 00 69 00 00 64 08 00 83 01 00 0c 7d 0e 00 74 0e 00 7c | ...t..i..}.....i..d......}..t..| |
| 2a80 | 0a 00 7c 09 00 7c 0b 00 83 03 00 7d 0f 00 78 33 00 7c 0f 00 69 0f 00 64 09 00 7c 06 00 64 0a 00 | ..|..|.....}..x3.|..i..d..|..d.. |
| 2aa0 | 7c 07 00 64 0b 00 7c 0e 00 83 00 03 44 5d 13 00 7d 10 00 7c 0d 00 69 10 00 7c 10 00 83 01 00 01 | |..d..|.....D]..}..|..i..|...... |
| 2ac0 | 71 54 01 57 88 01 00 69 00 00 64 05 00 83 01 00 70 0e 00 01 7c 0d 00 69 11 00 83 00 00 01 6e 01 | qT.W...i..d.....p...|..i......n. |
| 2ae0 | 00 01 7c 0f 00 69 12 00 6f 2f 00 01 88 01 00 69 00 00 64 0c 00 83 01 00 70 17 00 01 88 00 00 69 | ..|..i..o/.....i..d.....p......i |
| 2b00 | 13 00 74 04 00 64 0d 00 83 01 00 83 01 00 01 6e 01 00 01 64 0e 00 53 6e 01 00 01 64 00 00 53 28 | ..t..d.........n...d..Sn...d..S( |
| 2b20 | 0f 00 00 00 4e 63 01 00 00 00 04 00 00 00 03 00 00 00 13 00 00 00 73 9b 00 00 00 74 00 00 7c 00 | ....Nc................s....t..|. |
| 2b40 | 00 64 01 00 83 02 00 7d 01 00 7c 01 00 69 01 00 83 00 00 7d 02 00 7c 01 00 69 02 00 83 00 00 01 | .d.....}..|..i.....}..|..i...... |
| 2b60 | 74 03 00 69 04 00 7c 02 00 83 01 00 6f 62 00 01 74 05 00 64 02 00 83 01 00 7c 00 00 16 7d 03 00 | t..i..|.....ob..t..d.....|...}.. |
| 2b80 | 88 01 00 69 06 00 64 03 00 83 01 00 70 13 00 01 74 03 00 69 07 00 7c 03 00 83 01 00 82 01 00 71 | ...i..d.....p...t..i..|........q |
| 2ba0 | 97 00 01 88 01 00 69 06 00 64 04 00 83 01 00 70 1b 00 01 88 00 00 69 08 00 74 05 00 64 05 00 83 | ......i..d.....p......i..t..d... |
| 2bc0 | 01 00 7c 03 00 16 83 01 00 01 71 97 00 01 6e 01 00 01 7c 02 00 53 28 06 00 00 00 4e 52 09 00 00 | ..|.......q...n...|..S(....NR... |
| 2be0 | 00 73 1c 00 00 00 25 73 20 6c 6f 6f 6b 73 20 6c 69 6b 65 20 61 20 62 69 6e 61 72 79 20 66 69 6c | .s....%s.looks.like.a.binary.fil |
| 2c00 | 65 2e 74 04 00 00 00 74 65 78 74 74 05 00 00 00 71 75 69 65 74 73 0c 00 00 00 77 61 72 6e 69 6e | e.t....textt....quiets....warnin |
| 2c20 | 67 3a 20 25 73 0a 28 09 00 00 00 74 04 00 00 00 6f 70 65 6e 74 04 00 00 00 72 65 61 64 74 05 00 | g:.%s.(....t....opent....readt.. |
| 2c40 | 00 00 63 6c 6f 73 65 74 04 00 00 00 75 74 69 6c 74 06 00 00 00 62 69 6e 61 72 79 52 00 00 00 00 | ..closet....utilt....binaryR.... |
| 2c60 | 74 03 00 00 00 67 65 74 74 05 00 00 00 41 62 6f 72 74 74 04 00 00 00 77 61 72 6e 28 04 00 00 00 | t....gett....Abortt....warn(.... |
| 2c80 | 74 08 00 00 00 66 69 6c 65 6e 61 6d 65 74 01 00 00 00 66 52 6f 00 00 00 74 03 00 00 00 6d 73 67 | t....filenamet....fRo...t....msg |
| 2ca0 | 28 02 00 00 00 74 02 00 00 00 75 69 74 04 00 00 00 6f 70 74 73 28 00 00 00 00 73 28 00 00 00 2f | (....t....uit....opts(....s(.../ |
| 2cc0 | 73 79 73 2f 6c 69 62 2f 70 79 74 68 6f 6e 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d | sys/lib/python/mercurial/simplem |
| 2ce0 | 65 72 67 65 2e 70 79 74 08 00 00 00 72 65 61 64 66 69 6c 65 95 01 00 00 73 14 00 00 00 00 01 0f | erge.pyt....readfile....s....... |
| 2d00 | 01 0c 01 0a 01 10 01 10 01 10 01 13 01 10 01 1f 01 74 05 00 00 00 6c 61 62 65 6c 69 00 00 00 00 | .................t....labeli.... |
| 2d20 | 73 1c 00 00 00 63 61 6e 20 6f 6e 6c 79 20 73 70 65 63 69 66 79 20 74 77 6f 20 6c 61 62 65 6c 73 | s....can.only.specify.two.labels |
| 2d40 | 2e 74 05 00 00 00 70 72 69 6e 74 74 01 00 00 00 77 74 0a 00 00 00 61 74 6f 6d 69 63 74 65 6d 70 | .t....printt....wt....atomictemp |
| 2d60 | 74 0a 00 00 00 6e 6f 5f 6d 69 6e 69 6d 61 6c 52 2e 00 00 00 52 2f 00 00 00 52 35 00 00 00 52 70 | t....no_minimalR....R/...R5...Rp |
| 2d80 | 00 00 00 73 21 00 00 00 77 61 72 6e 69 6e 67 3a 20 63 6f 6e 66 6c 69 63 74 73 20 64 75 72 69 6e | ...s!...warning:.conflicts.durin |
| 2da0 | 67 20 6d 65 72 67 65 2e 0a 69 01 00 00 00 28 14 00 00 00 52 76 00 00 00 74 03 00 00 00 70 6f 70 | g.merge..i....(....Rv...t....pop |
| 2dc0 | 52 74 00 00 00 52 77 00 00 00 52 00 00 00 00 74 02 00 00 00 6f 73 74 04 00 00 00 70 61 74 68 74 | Rt...Rw...R....t....ost....patht |
| 2de0 | 08 00 00 00 72 65 61 6c 70 61 74 68 74 06 00 00 00 6f 70 65 6e 65 72 74 07 00 00 00 64 69 72 6e | ....realpatht....openert....dirn |
| 2e00 | 61 6d 65 74 08 00 00 00 62 61 73 65 6e 61 6d 65 52 10 00 00 00 74 03 00 00 00 73 79 73 74 06 00 | amet....basenameR....t....syst.. |
| 2e20 | 00 00 73 74 64 6f 75 74 52 1a 00 00 00 52 3a 00 00 00 74 05 00 00 00 77 72 69 74 65 74 06 00 00 | ..stdoutR....R:...t....writet... |
| 2e40 | 00 72 65 6e 61 6d 65 52 27 00 00 00 52 78 00 00 00 28 11 00 00 00 52 7c 00 00 00 74 05 00 00 00 | .renameR'...Rx...(....R|...t.... |
| 2e60 | 6c 6f 63 61 6c 52 20 00 00 00 74 05 00 00 00 6f 74 68 65 72 52 7d 00 00 00 52 7e 00 00 00 52 2e | localR....t....otherR}...R~...R. |
| 2e80 | 00 00 00 52 2f 00 00 00 74 06 00 00 00 6c 61 62 65 6c 73 74 09 00 00 00 6c 6f 63 61 6c 74 65 78 | ...R/...t....labelst....localtex |
| 2ea0 | 74 52 1b 00 00 00 74 09 00 00 00 6f 74 68 65 72 74 65 78 74 52 88 00 00 00 74 03 00 00 00 6f 75 | tR....t....othertextR....t....ou |
| 2ec0 | 74 52 35 00 00 00 74 02 00 00 00 6d 33 74 04 00 00 00 6c 69 6e 65 28 00 00 00 00 28 02 00 00 00 | tR5...t....m3t....line(....(.... |
| 2ee0 | 52 7c 00 00 00 52 7d 00 00 00 73 28 00 00 00 2f 73 79 73 2f 6c 69 62 2f 70 79 74 68 6f 6e 2f 6d | R|...R}...s(.../sys/lib/python/m |
| 2f00 | 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 74 0b 00 00 00 73 69 6d 70 | ercurial/simplemerge.pyt....simp |
| 2f20 | 6c 65 6d 65 72 67 65 94 01 00 00 73 3c 00 00 00 00 01 12 0c 06 01 06 01 12 01 07 01 13 01 07 01 | lemerge....s<................... |
| 2f40 | 13 01 07 01 19 02 0c 01 0c 01 0c 02 12 01 10 01 1b 01 25 02 09 02 10 02 12 01 18 01 07 00 06 01 | ..................%............. |
| 2f60 | 11 02 10 01 0e 02 0a 01 10 01 17 01 28 0d 00 00 00 74 04 00 00 00 69 31 38 6e 52 00 00 00 00 52 | ............(....t....i18nR....R |
| 2f80 | 74 00 00 00 52 1e 00 00 00 52 8b 00 00 00 52 85 00 00 00 74 09 00 00 00 45 78 63 65 70 74 69 6f | t...R....R....R....t....Exceptio |
| 2fa0 | 6e 52 01 00 00 00 52 0c 00 00 00 52 19 00 00 00 74 06 00 00 00 6f 62 6a 65 63 74 52 1a 00 00 00 | nR....R....R....t....objectR.... |
| 2fc0 | 52 97 00 00 00 28 00 00 00 00 28 00 00 00 00 28 00 00 00 00 73 28 00 00 00 2f 73 79 73 2f 6c 69 | R....(....(....(....s(.../sys/li |
| 2fe0 | 62 2f 70 79 74 68 6f 6e 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 | b/python/mercurial/simplemerge.p |
| 3000 | 79 73 08 00 00 00 3c 6d 6f 64 75 6c 65 3e 15 00 00 00 73 10 00 00 00 10 01 18 01 18 02 16 03 09 | ys....<module>....s............. |
| 3020 | 16 09 0b 16 ff 00 58 | ......X |
 |
index : plan9front.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiff |
blob: 49e4952bb1e7b1a3a075a3b6975eeb48521243d9 (plain)