| ofs | hex dump | ascii |
|---|---|---|
| 0000 | d1 f2 0d 0a d0 f3 27 4d 63 00 00 00 00 00 00 00 00 08 00 00 00 40 00 00 00 73 8b 00 00 00 64 00 | ......'Mc............@...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 6a 00 00 00 2f 68 6f 6d 65 2f 6e 69 73 68 61 6e | (....(....(....sj.../home/nishan |
| 0140 | 74 68 2f 44 65 73 6b 74 6f 70 2f 70 79 74 2d 62 6c 64 2f 70 79 74 61 73 6b 2f 65 67 67 73 2f 6d | th/Desktop/pyt-bld/pytask/eggs/m |
| 0160 | 65 72 63 75 72 69 61 6c 2d 31 2e 37 2e 33 2d 70 79 32 2e 36 2d 6c 69 6e 75 78 2d 78 38 36 5f 36 | ercurial-1.7.3-py2.6-linux-x86_6 |
| 0180 | 34 2e 65 67 67 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 | 4.egg/mercurial/simplemerge.pyR. |
| 01a0 | 00 00 00 18 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 | .......s......c............C...s |
| 01c0 | 4e 00 00 00 74 00 00 7c 00 00 64 01 00 19 7c 01 00 64 01 00 19 83 02 00 7d 02 00 74 01 00 7c 00 | N...t..|..d...|..d......}..t..|. |
| 01e0 | 00 64 02 00 19 7c 01 00 64 02 00 19 83 02 00 7d 03 00 7c 02 00 7c 03 00 6a 00 00 6f 0b 00 01 7c | .d...|..d......}..|..|..j..o...| |
| 0200 | 02 00 7c 03 00 66 02 00 53 01 64 03 00 53 64 03 00 53 28 04 00 00 00 73 1a 01 00 00 47 69 76 65 | ..|..f..S.d..Sd..S(....s....Give |
| 0220 | 6e 20 74 77 6f 20 72 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 | n.two.ranges.return.the.range.wh |
| 0240 | 65 72 65 20 74 68 65 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 | ere.they.intersect.or.None...... |
| 0260 | 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 30 2c 20 36 29 29 0a | .>>>.intersect((0,.10),.(0,.6)). |
| 0280 | 20 20 20 20 28 30 2c 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 | ....(0,.6).....>>>.intersect((0, |
| 02a0 | 20 31 30 29 2c 20 28 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 | .10),.(5,.15)).....(5,.10).....> |
| 02c0 | 3e 3e 20 69 6e 74 65 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 | >>.intersect((0,.10),.(10,.15)). |
| 02e0 | 20 20 20 20 3e 3e 3e 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 | ....>>>.intersect((0,.9),.(10,.1 |
| 0300 | 35 29 29 0a 20 20 20 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 | 5)).....>>>.intersect((0,.9),.(7 |
| 0320 | 2c 20 31 35 29 29 0a 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 | ,.15)).....(7,.9).....i....i.... |
| 0340 | 4e 28 03 00 00 00 74 03 00 00 00 6d 61 78 74 03 00 00 00 6d 69 6e 74 04 00 00 00 4e 6f 6e 65 28 | N(....t....maxt....mint....None( |
| 0360 | 04 00 00 00 74 02 00 00 00 72 61 74 02 00 00 00 72 62 74 02 00 00 00 73 61 74 02 00 00 00 73 62 | ....t....rat....rbt....sat....sb |
| 0380 | 28 00 00 00 00 28 00 00 00 00 73 6a 00 00 00 2f 68 6f 6d 65 2f 6e 69 73 68 61 6e 74 68 2f 44 65 | (....(....sj.../home/nishanth/De |
| 03a0 | 73 6b 74 6f 70 2f 70 79 74 2d 62 6c 64 2f 70 79 74 61 73 6b 2f 65 67 67 73 2f 6d 65 72 63 75 72 | sktop/pyt-bld/pytask/eggs/mercur |
| 03c0 | 69 61 6c 2d 31 2e 37 2e 33 2d 70 79 32 2e 36 2d 6c 69 6e 75 78 2d 78 38 36 5f 36 34 2e 65 67 67 | ial-1.7.3-py2.6-linux-x86_64.egg |
| 03e0 | 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 09 00 00 00 69 6e | /mercurial/simplemerge.pyt....in |
| 0400 | 74 65 72 73 65 63 74 1b 00 00 00 73 0a 00 00 00 00 0f 17 01 17 01 0d 01 0b 02 63 06 00 00 00 08 | tersect....s..............c..... |
| 0420 | 00 00 00 05 00 00 00 43 00 00 00 73 6e 00 00 00 7c 02 00 7c 01 00 18 7c 05 00 7c 04 00 18 6a 03 | .......C...sn...|..|...|..|...j. |
| 0440 | 00 6f 05 00 01 74 00 00 53 01 78 4d 00 74 01 00 74 02 00 7c 01 00 7c 02 00 83 02 00 74 02 00 7c | .o...t..S.xM.t..t..|..|.....t..| |
| 0460 | 04 00 7c 05 00 83 02 00 83 02 00 44 5d 26 00 5c 02 00 7d 06 00 7d 07 00 7c 00 00 7c 06 00 19 7c | ..|........D]&.\..}..}..|..|...| |
| 0480 | 03 00 7c 07 00 19 6a 03 00 6f 05 00 01 74 00 00 53 01 71 3c 00 57 74 03 00 53 64 01 00 53 28 02 | ..|...j..o...t..S.q<.Wt..Sd..S(. |
| 04a0 | 00 00 00 73 3f 00 00 00 43 6f 6d 70 61 72 65 20 61 5b 61 73 74 61 72 74 3a 61 65 6e 64 5d 20 3d | ...s?...Compare.a[astart:aend].= |
| 04c0 | 3d 20 62 5b 62 73 74 61 72 74 3a 62 65 6e 64 5d 2c 20 77 69 74 68 6f 75 74 20 73 6c 69 63 69 6e | =.b[bstart:bend],.without.slicin |
| 04e0 | 67 2e 0a 20 20 20 20 4e 28 04 00 00 00 74 05 00 00 00 46 61 6c 73 65 74 03 00 00 00 7a 69 70 74 | g......N(....t....Falset....zipt |
| 0500 | 06 00 00 00 78 72 61 6e 67 65 74 04 00 00 00 54 72 75 65 28 08 00 00 00 74 01 00 00 00 61 74 06 | ....xranget....True(....t....at. |
| 0520 | 00 00 00 61 73 74 61 72 74 74 04 00 00 00 61 65 6e 64 74 01 00 00 00 62 74 06 00 00 00 62 73 74 | ...astartt....aendt....bt....bst |
| 0540 | 61 72 74 74 04 00 00 00 62 65 6e 64 74 02 00 00 00 69 61 74 02 00 00 00 69 62 28 00 00 00 00 28 | artt....bendt....iat....ib(....( |
| 0560 | 00 00 00 00 73 6a 00 00 00 2f 68 6f 6d 65 2f 6e 69 73 68 61 6e 74 68 2f 44 65 73 6b 74 6f 70 2f | ....sj.../home/nishanth/Desktop/ |
| 0580 | 70 79 74 2d 62 6c 64 2f 70 79 74 61 73 6b 2f 65 67 67 73 2f 6d 65 72 63 75 72 69 61 6c 2d 31 2e | pyt-bld/pytask/eggs/mercurial-1. |
| 05a0 | 37 2e 33 2d 70 79 32 2e 36 2d 6c 69 6e 75 78 2d 78 38 36 5f 36 34 2e 65 67 67 2f 6d 65 72 63 75 | 7.3-py2.6-linux-x86_64.egg/mercu |
| 05c0 | 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 74 0d 00 00 00 63 6f 6d 70 61 72 65 5f | rial/simplemerge.pyt....compare_ |
| 05e0 | 72 61 6e 67 65 31 00 00 00 73 0e 00 00 00 00 03 15 01 05 01 22 00 0c 01 15 01 09 02 74 0a 00 00 | range1...s..........".......t... |
| 0600 | 00 4d 65 72 67 65 33 54 65 78 74 63 00 00 00 00 00 00 00 00 09 00 00 00 42 00 00 00 73 8c 00 00 | .Merge3Textc............B...s... |
| 0620 | 00 65 00 00 5a 01 00 64 00 00 5a 02 00 64 0d 00 64 0d 00 64 0d 00 64 01 00 84 03 00 5a 04 00 64 | .e..Z..d..Z..d..d..d..d.....Z..d |
| 0640 | 0d 00 64 0d 00 64 0d 00 64 02 00 64 03 00 64 04 00 64 0d 00 65 05 00 64 05 00 84 08 00 5a 06 00 | ..d..d..d..d..d..d..e..d.....Z.. |
| 0660 | 64 06 00 84 00 00 5a 07 00 64 07 00 84 00 00 5a 08 00 64 08 00 84 00 00 5a 09 00 64 09 00 84 00 | d.....Z..d.....Z..d.....Z..d.... |
| 0680 | 00 5a 0a 00 64 0a 00 84 00 00 5a 0b 00 65 0c 00 65 0b 00 83 01 00 5a 0b 00 64 0b 00 84 00 00 5a | .Z..d.....Z..e..e.....Z..d.....Z |
| 06a0 | 0d 00 64 0c 00 84 00 00 5a 0e 00 52 53 28 0e 00 00 00 73 a0 00 00 00 33 2d 77 61 79 20 6d 65 72 | ..d.....Z..RS(....s....3-way.mer |
| 06c0 | 67 65 20 6f 66 20 74 65 78 74 73 2e 0a 0a 20 20 20 20 47 69 76 65 6e 20 73 74 72 69 6e 67 73 20 | ge.of.texts.......Given.strings. |
| 06e0 | 42 41 53 45 2c 20 4f 54 48 45 52 2c 20 54 48 49 53 2c 20 74 72 69 65 73 20 74 6f 20 70 72 6f 64 | BASE,.OTHER,.THIS,.tries.to.prod |
| 0700 | 75 63 65 20 61 20 63 6f 6d 62 69 6e 65 64 20 74 65 78 74 0a 20 20 20 20 69 6e 63 6f 72 70 6f 72 | uce.a.combined.text.....incorpor |
| 0720 | 61 74 69 6e 67 20 74 68 65 20 63 68 61 6e 67 65 73 20 66 72 6f 6d 20 62 6f 74 68 20 42 41 53 45 | ating.the.changes.from.both.BASE |
| 0740 | 2d 3e 4f 54 48 45 52 20 61 6e 64 20 42 41 53 45 2d 3e 54 48 49 53 2e 63 07 00 00 00 07 00 00 00 | ->OTHER.and.BASE->THIS.c........ |
| 0760 | 02 00 00 00 43 00 00 00 73 9a 00 00 00 7c 01 00 7c 00 00 5f 00 00 7c 02 00 7c 00 00 5f 01 00 7c | ....C...s....|..|.._..|..|.._..| |
| 0780 | 03 00 7c 00 00 5f 02 00 7c 04 00 64 00 00 6a 08 00 6f 13 00 01 74 04 00 69 05 00 7c 01 00 83 01 | ..|.._..|..d..j..o...t..i..|.... |
| 07a0 | 00 7d 04 00 6e 01 00 01 7c 05 00 64 00 00 6a 08 00 6f 13 00 01 74 04 00 69 05 00 7c 02 00 83 01 | .}..n...|..d..j..o...t..i..|.... |
| 07c0 | 00 7d 05 00 6e 01 00 01 7c 06 00 64 00 00 6a 08 00 6f 13 00 01 74 04 00 69 05 00 7c 03 00 83 01 | .}..n...|..d..j..o...t..i..|.... |
| 07e0 | 00 7d 06 00 6e 01 00 01 7c 04 00 7c 00 00 5f 06 00 7c 05 00 7c 00 00 5f 07 00 7c 06 00 7c 00 00 | .}..n...|..|.._..|..|.._..|..|.. |
| 0800 | 5f 08 00 64 00 00 53 28 01 00 00 00 4e 28 09 00 00 00 74 08 00 00 00 62 61 73 65 74 65 78 74 74 | _..d..S(....N(....t....basetextt |
| 0820 | 05 00 00 00 61 74 65 78 74 74 05 00 00 00 62 74 65 78 74 52 06 00 00 00 74 05 00 00 00 6d 64 69 | ....atextt....btextR....t....mdi |
| 0840 | 66 66 74 0d 00 00 00 73 70 6c 69 74 6e 65 77 6c 69 6e 65 73 74 04 00 00 00 62 61 73 65 52 10 00 | fft....splitnewlinest....baseR.. |
| 0860 | 00 00 52 13 00 00 00 28 07 00 00 00 74 04 00 00 00 73 65 6c 66 52 1a 00 00 00 52 1b 00 00 00 52 | ..R....(....t....selfR....R....R |
| 0880 | 1c 00 00 00 52 1f 00 00 00 52 10 00 00 00 52 13 00 00 00 28 00 00 00 00 28 00 00 00 00 73 6a 00 | ....R....R....R....(....(....sj. |
| 08a0 | 00 00 2f 68 6f 6d 65 2f 6e 69 73 68 61 6e 74 68 2f 44 65 73 6b 74 6f 70 2f 70 79 74 2d 62 6c 64 | ../home/nishanth/Desktop/pyt-bld |
| 08c0 | 2f 70 79 74 61 73 6b 2f 65 67 67 73 2f 6d 65 72 63 75 72 69 61 6c 2d 31 2e 37 2e 33 2d 70 79 32 | /pytask/eggs/mercurial-1.7.3-py2 |
| 08e0 | 2e 36 2d 6c 69 6e 75 78 2d 78 38 36 5f 36 34 2e 65 67 67 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 | .6-linux-x86_64.egg/mercurial/si |
| 0900 | 6d 70 6c 65 6d 65 72 67 65 2e 70 79 74 08 00 00 00 5f 5f 69 6e 69 74 5f 5f 41 00 00 00 73 18 00 | mplemerge.pyt....__init__A...s.. |
| 0920 | 00 00 00 01 09 01 09 01 09 01 0d 01 13 01 0d 01 13 01 0d 01 13 01 09 01 09 01 73 07 00 00 00 3c | ..........................s....< |
| 0940 | 3c 3c 3c 3c 3c 3c 73 07 00 00 00 3d 3d 3d 3d 3d 3d 3d 73 07 00 00 00 3e 3e 3e 3e 3e 3e 3e 63 09 | <<<<<<s....=======s....>>>>>>>c. |
| 0960 | 00 00 00 0e 00 00 00 09 00 00 00 63 00 00 00 73 d2 02 00 00 74 00 00 7c 00 00 5f 01 00 64 01 00 | ...........c...s....t..|.._..d.. |
| 0980 | 7d 09 00 74 02 00 7c 00 00 69 03 00 83 01 00 64 02 00 6a 04 00 6f 46 00 01 7c 00 00 69 03 00 64 | }..t..|..i.....d..j..oF..|..i..d |
| 09a0 | 02 00 19 69 04 00 64 03 00 83 01 00 6f 0a 00 01 64 03 00 7d 09 00 71 6b 00 01 7c 00 00 69 03 00 | ...i..d.....o...d..}..qk..|..i.. |
| 09c0 | 64 02 00 19 69 04 00 64 04 00 83 01 00 6f 0a 00 01 64 04 00 7d 09 00 71 6b 00 01 6e 01 00 01 7c | d...i..d.....o...d..}..qk..n...| |
| 09e0 | 07 00 6f 14 00 01 7c 08 00 6f 0d 00 01 74 05 00 83 00 00 82 01 00 6e 01 00 01 7c 01 00 6f 12 00 | ..o...|..o...t........n...|..o.. |
| 0a00 | 01 7c 04 00 64 05 00 17 7c 01 00 17 7d 04 00 6e 01 00 01 7c 02 00 6f 12 00 01 7c 06 00 64 05 00 | .|..d...|...}..n...|..o...|..d.. |
| 0a20 | 17 7c 02 00 17 7d 06 00 6e 01 00 01 7c 03 00 6f 19 00 01 7c 07 00 6f 12 00 01 7c 07 00 64 05 00 | .|...}..n...|..o...|..o...|..d.. |
| 0a40 | 17 7c 03 00 17 7d 07 00 6e 01 00 01 7c 00 00 69 06 00 83 00 00 7d 0a 00 7c 08 00 74 07 00 6a 08 | .|...}..n...|..i.....}..|..t..j. |
| 0a60 | 00 6f 13 00 01 7c 00 00 69 08 00 7c 0a 00 83 01 00 7d 0a 00 6e 01 00 01 78 c7 01 7c 0a 00 44 5d | .o...|..i..|.....}..n...x..|..D] |
| 0a80 | bf 01 7d 0b 00 7c 0b 00 64 02 00 19 7d 0c 00 7c 0c 00 64 06 00 6a 02 00 6f 32 00 01 78 9f 01 74 | ..}..|..d...}..|..d..j..o2..x..t |
| 0aa0 | 09 00 7c 0b 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 0a 00 | ..|..d...|..d......D]..}..|..i.. |
| 0ac0 | 7c 0d 00 19 56 01 71 40 01 57 71 0b 01 01 7c 0c 00 64 09 00 6a 02 00 70 0d 00 01 7c 0c 00 64 0a | |...V.q@.Wq...|..d..j..p...|..d. |
| 0ae0 | 00 6a 02 00 6f 32 00 01 78 53 01 74 09 00 7c 0b 00 64 07 00 19 7c 0b 00 64 08 00 19 83 02 00 44 | .j..o2..xS.t..|..d...|..d......D |
| 0b00 | 5d 12 00 7d 0d 00 7c 00 00 69 03 00 7c 0d 00 19 56 01 71 8c 01 57 71 0b 01 01 7c 0c 00 64 0b 00 | ]..}..|..i..|...V.q..Wq...|..d.. |
| 0b20 | 6a 02 00 6f 32 00 01 78 14 01 74 09 00 7c 0b 00 64 07 00 19 7c 0b 00 64 08 00 19 83 02 00 44 5d | j..o2..x..t..|..d...|..d......D] |
| 0b40 | 12 00 7d 0d 00 7c 00 00 69 0b 00 7c 0d 00 19 56 01 71 cb 01 57 71 0b 01 01 7c 0c 00 64 0c 00 6a | ..}..|..i..|...V.q..Wq...|..d..j |
| 0b60 | 02 00 6f cc 00 01 74 07 00 7c 00 00 5f 01 00 7c 04 00 7c 09 00 17 56 01 78 2b 00 74 09 00 7c 0b | ..o...t..|.._..|..|...V.x+.t..|. |
| 0b80 | 00 64 0d 00 19 7c 0b 00 64 0e 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..|... |
| 0ba0 | 56 01 71 1c 02 57 7c 07 00 64 11 00 6a 09 00 6f 3b 00 01 7c 07 00 7c 09 00 17 56 01 78 2f 00 74 | V.q..W|..d..j..o;..|..|...V.x/.t |
| 0bc0 | 09 00 7c 0b 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 0a 00 | ..|..d...|..d......D]..}..|..i.. |
| 0be0 | 7c 0d 00 19 56 01 71 60 02 57 6e 01 00 01 7c 05 00 7c 09 00 17 56 01 78 2b 00 74 09 00 7c 0b 00 | |...V.q`.Wn...|..|...V.x+.t..|.. |
| 0c00 | 64 0f 00 19 7c 0b 00 64 10 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 |
| 0c20 | 01 71 9b 02 57 7c 06 00 7c 09 00 17 56 01 71 0b 01 01 74 0d 00 7c 0c 00 83 01 00 82 01 00 71 0b | .q..W|..|...V.q...t..|........q. |
| 0c40 | 01 57 64 11 00 53 28 12 00 00 00 73 27 00 00 00 52 65 74 75 72 6e 20 6d 65 72 67 65 20 69 6e 20 | .Wd..S(....s'...Return.merge.in. |
| 0c60 | 63 76 73 2d 6c 69 6b 65 20 66 6f 72 6d 2e 0a 20 20 20 20 20 20 20 20 73 01 00 00 00 0a 69 00 00 | cvs-like.form..........s.....i.. |
| 0c80 | 00 00 73 02 00 00 00 0d 0a 73 01 00 00 00 0d 74 01 00 00 00 20 74 09 00 00 00 75 6e 63 68 61 6e | ..s......s.....t.....t....unchan |
| 0ca0 | 67 65 64 69 01 00 00 00 69 02 00 00 00 52 10 00 00 00 74 04 00 00 00 73 61 6d 65 52 13 00 00 00 | gedi....i....R....t....sameR.... |
| 0cc0 | 74 08 00 00 00 63 6f 6e 66 6c 69 63 74 69 03 00 00 00 69 04 00 00 00 69 05 00 00 00 69 06 00 00 | t....conflicti....i....i....i... |
| 0ce0 | 00 4e 28 0e 00 00 00 52 0c 00 00 00 74 09 00 00 00 63 6f 6e 66 6c 69 63 74 73 74 03 00 00 00 6c | .N(....R....t....conflictst....l |
| 0d00 | 65 6e 52 10 00 00 00 74 08 00 00 00 65 6e 64 73 77 69 74 68 52 01 00 00 00 74 0d 00 00 00 6d 65 | enR....t....endswithR....t....me |
| 0d20 | 72 67 65 5f 72 65 67 69 6f 6e 73 52 0f 00 00 00 74 17 00 00 00 72 65 70 72 6f 63 65 73 73 5f 6d | rge_regionsR....t....reprocess_m |
| 0d40 | 65 72 67 65 5f 72 65 67 69 6f 6e 73 74 05 00 00 00 72 61 6e 67 65 52 1f 00 00 00 52 13 00 00 00 | erge_regionst....rangeR....R.... |
| 0d60 | 52 06 00 00 00 74 0a 00 00 00 56 61 6c 75 65 45 72 72 6f 72 28 0e 00 00 00 52 20 00 00 00 74 06 | R....t....ValueError(....R....t. |
| 0d80 | 00 00 00 6e 61 6d 65 5f 61 74 06 00 00 00 6e 61 6d 65 5f 62 74 09 00 00 00 6e 61 6d 65 5f 62 61 | ...name_at....name_bt....name_ba |
| 0da0 | 73 65 74 0c 00 00 00 73 74 61 72 74 5f 6d 61 72 6b 65 72 74 0a 00 00 00 6d 69 64 5f 6d 61 72 6b | set....start_markert....mid_mark |
| 0dc0 | 65 72 74 0a 00 00 00 65 6e 64 5f 6d 61 72 6b 65 72 74 0b 00 00 00 62 61 73 65 5f 6d 61 72 6b 65 | ert....end_markert....base_marke |
| 0de0 | 72 74 09 00 00 00 72 65 70 72 6f 63 65 73 73 74 07 00 00 00 6e 65 77 6c 69 6e 65 52 29 00 00 00 | rt....reprocesst....newlineR)... |
| 0e00 | 74 01 00 00 00 74 74 04 00 00 00 77 68 61 74 74 01 00 00 00 69 28 00 00 00 00 28 00 00 00 00 73 | t....tt....whatt....i(....(....s |
| 0e20 | 6a 00 00 00 2f 68 6f 6d 65 2f 6e 69 73 68 61 6e 74 68 2f 44 65 73 6b 74 6f 70 2f 70 79 74 2d 62 | j.../home/nishanth/Desktop/pyt-b |
| 0e40 | 6c 64 2f 70 79 74 61 73 6b 2f 65 67 67 73 2f 6d 65 72 63 75 72 69 61 6c 2d 31 2e 37 2e 33 2d 70 | ld/pytask/eggs/mercurial-1.7.3-p |
| 0e60 | 79 32 2e 36 2d 6c 69 6e 75 78 2d 78 38 36 5f 36 34 2e 65 67 67 2f 6d 65 72 63 75 72 69 61 6c 2f | y2.6-linux-x86_64.egg/mercurial/ |
| 0e80 | 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 74 0b 00 00 00 6d 65 72 67 65 5f 6c 69 6e 65 73 4f 00 | simplemerge.pyt....merge_linesO. |
| 0ea0 | 00 00 73 64 00 00 00 00 0b 09 01 06 01 16 01 17 01 0a 01 17 01 0e 01 0e 01 0d 01 07 01 12 01 07 | ..sd............................ |
| 0ec0 | 01 12 01 0e 01 12 01 0c 01 0d 01 13 01 07 00 06 01 0a 01 0d 01 18 00 06 01 14 01 1a 01 18 00 06 | ................................ |
| 0ee0 | 01 14 01 0d 01 18 00 06 01 14 01 0d 01 09 01 09 01 18 00 06 01 10 01 0d 01 09 01 18 00 06 01 14 | ................................ |
| 0f00 | 01 09 01 18 00 06 01 10 01 0d 02 63 01 00 00 00 04 00 00 00 07 00 00 00 63 00 00 00 73 93 01 00 | ...........c............c...s... |
| 0f20 | 00 78 8c 01 7c 00 00 69 00 00 83 00 00 44 5d 7e 01 7d 01 00 7c 01 00 64 01 00 19 7d 02 00 7c 02 | .x..|..i.....D]~.}..|..d...}..|. |
| 0f40 | 00 64 02 00 6a 02 00 6f 36 00 01 78 5e 01 74 01 00 7c 01 00 64 03 00 19 7c 01 00 64 04 00 19 83 | .d..j..o6..x^.t..|..d...|..d.... |
| 0f60 | 02 00 44 5d 16 00 7d 03 00 64 05 00 7c 00 00 69 02 00 7c 03 00 19 17 56 01 71 42 00 57 71 0d 00 | ..D]..}..d..|..i..|....V.qB.Wq.. |
| 0f80 | 01 7c 02 00 64 06 00 6a 02 00 70 0d 00 01 7c 02 00 64 07 00 6a 02 00 6f 3e 00 01 78 0e 01 74 01 | .|..d..j..p...|..d..j..o>..x..t. |
| 0fa0 | 00 7c 01 00 64 03 00 19 7c 01 00 64 04 00 19 83 02 00 44 5d 1e 00 7d 03 00 7c 02 00 64 01 00 19 | .|..d...|..d......D]..}..|..d... |
| 0fc0 | 64 08 00 17 7c 00 00 69 03 00 7c 03 00 19 17 56 01 71 92 00 57 71 0d 00 01 7c 02 00 64 09 00 6a | d...|..i..|....V.q..Wq...|..d..j |
| 0fe0 | 02 00 6f 36 00 01 78 c3 00 74 01 00 7c 01 00 64 03 00 19 7c 01 00 64 04 00 19 83 02 00 44 5d 16 | ..o6..x..t..|..d...|..d......D]. |
| 1000 | 00 7d 03 00 64 0a 00 7c 00 00 69 04 00 7c 03 00 19 17 56 01 71 dd 00 57 71 0d 00 01 7c 02 00 64 | .}..d..|..i..|....V.q..Wq...|..d |
| 1020 | 0b 00 6a 02 00 6f 77 00 01 64 0c 00 56 01 78 2f 00 74 01 00 7c 01 00 64 0d 00 19 7c 01 00 64 0e | ..j..ow..d..V.x/.t..|..d...|..d. |
| 1040 | 00 19 83 02 00 44 5d 16 00 7d 03 00 64 0f 00 7c 00 00 69 03 00 7c 03 00 19 17 56 01 71 25 01 57 | .....D]..}..d..|..i..|....V.q%.W |
| 1060 | 64 10 00 56 01 78 2f 00 74 01 00 7c 01 00 64 11 00 19 7c 01 00 64 12 00 19 83 02 00 44 5d 16 00 | d..V.x/.t..|..d...|..d......D].. |
| 1080 | 7d 03 00 64 13 00 7c 00 00 69 04 00 7c 03 00 19 17 56 01 71 5c 01 57 64 14 00 56 01 71 0d 00 01 | }..d..|..i..|....V.q\.Wd..V.q... |
| 10a0 | 74 05 00 7c 02 00 83 01 00 82 01 00 71 0d 00 57 64 15 00 53 28 16 00 00 00 73 68 00 00 00 52 65 | t..|........q..Wd..S(....sh...Re |
| 10c0 | 74 75 72 6e 20 6d 65 72 67 65 20 77 69 74 68 20 63 6f 6e 66 6c 69 63 74 73 2c 20 73 68 6f 77 69 | turn.merge.with.conflicts,.showi |
| 10e0 | 6e 67 20 6f 72 69 67 69 6e 20 6f 66 20 6c 69 6e 65 73 2e 0a 0a 20 20 20 20 20 20 20 20 4d 6f 73 | ng.origin.of.lines...........Mos |
| 1100 | 74 20 75 73 65 66 75 6c 20 66 6f 72 20 64 65 62 75 67 67 69 6e 67 20 6d 65 72 67 65 2e 0a 20 20 | t.useful.for.debugging.merge.... |
| 1120 | 20 20 20 20 20 20 69 00 00 00 00 52 23 00 00 00 69 01 00 00 00 69 02 00 00 00 73 04 00 00 00 75 | ......i....R#...i....i....s....u |
| 1140 | 20 7c 20 52 10 00 00 00 52 24 00 00 00 73 03 00 00 00 20 7c 20 52 13 00 00 00 73 04 00 00 00 62 | .|.R....R$...s.....|.R....s....b |
| 1160 | 20 7c 20 52 25 00 00 00 73 05 00 00 00 3c 3c 3c 3c 0a 69 03 00 00 00 69 04 00 00 00 73 04 00 00 | .|.R%...s....<<<<.i....i....s... |
| 1180 | 00 41 20 7c 20 73 05 00 00 00 2d 2d 2d 2d 0a 69 05 00 00 00 69 06 00 00 00 73 04 00 00 00 42 20 | .A.|.s....----.i....i....s....B. |
| 11a0 | 7c 20 73 05 00 00 00 3e 3e 3e 3e 0a 4e 28 06 00 00 00 52 29 00 00 00 52 2b 00 00 00 52 1f 00 00 | |.s....>>>>.N(....R)...R+...R... |
| 11c0 | 00 52 10 00 00 00 52 13 00 00 00 52 2c 00 00 00 28 04 00 00 00 52 20 00 00 00 52 36 00 00 00 52 | .R....R....R,...(....R....R6...R |
| 11e0 | 37 00 00 00 52 38 00 00 00 28 00 00 00 00 28 00 00 00 00 73 6a 00 00 00 2f 68 6f 6d 65 2f 6e 69 | 7...R8...(....(....sj.../home/ni |
| 1200 | 73 68 61 6e 74 68 2f 44 65 73 6b 74 6f 70 2f 70 79 74 2d 62 6c 64 2f 70 79 74 61 73 6b 2f 65 67 | shanth/Desktop/pyt-bld/pytask/eg |
| 1220 | 67 73 2f 6d 65 72 63 75 72 69 61 6c 2d 31 2e 37 2e 33 2d 70 79 32 2e 36 2d 6c 69 6e 75 78 2d 78 | gs/mercurial-1.7.3-py2.6-linux-x |
| 1240 | 38 36 5f 36 34 2e 65 67 67 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e | 86_64.egg/mercurial/simplemerge. |
| 1260 | 70 79 74 0f 00 00 00 6d 65 72 67 65 5f 61 6e 6e 6f 74 61 74 65 64 87 00 00 00 73 34 00 00 00 00 | pyt....merge_annotated....s4.... |
| 1280 | 05 0d 00 06 01 0a 01 0d 01 18 00 06 01 18 01 1a 01 18 00 06 01 20 01 0d 01 18 00 06 01 18 01 0d | ................................ |
| 12a0 | 01 05 01 18 00 06 01 14 01 05 01 18 00 06 01 14 01 09 02 63 01 00 00 00 03 00 00 00 0a 00 00 00 | ...................c............ |
| 12c0 | 63 00 00 00 73 20 01 00 00 78 19 01 7c 00 00 69 00 00 83 00 00 44 5d 0b 01 7d 01 00 7c 01 00 64 | c...s....x..|..i.....D]..}..|..d |
| 12e0 | 01 00 19 7d 02 00 7c 02 00 64 02 00 6a 02 00 6f 21 00 01 7c 02 00 7c 00 00 69 01 00 7c 01 00 64 | ...}..|..d..j..o!..|..|..i..|..d |
| 1300 | 03 00 19 7c 01 00 64 04 00 19 21 66 02 00 56 01 71 0d 00 01 7c 02 00 64 05 00 6a 02 00 70 0d 00 | ...|..d...!f..V.q...|..d..j..p.. |
| 1320 | 01 7c 02 00 64 06 00 6a 02 00 6f 21 00 01 7c 02 00 7c 00 00 69 02 00 7c 01 00 64 03 00 19 7c 01 | .|..d..j..o!..|..|..i..|..d...|. |
| 1340 | 00 64 04 00 19 21 66 02 00 56 01 71 0d 00 01 7c 02 00 64 07 00 6a 02 00 6f 21 00 01 7c 02 00 7c | .d...!f..V.q...|..d..j..o!..|..| |
| 1360 | 00 00 69 03 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 | ..i..|..d...|..d...!f..V.q...|.. |
| 1380 | 64 08 00 6a 02 00 6f 4b 00 01 7c 02 00 7c 00 00 69 01 00 7c 01 00 64 03 00 19 7c 01 00 64 04 00 | d..j..oK..|..|..i..|..d...|..d.. |
| 13a0 | 19 21 7c 00 00 69 02 00 7c 01 00 64 09 00 19 7c 01 00 64 0a 00 19 21 7c 00 00 69 03 00 7c 01 00 | .!|..i..|..d...|..d...!|..i..|.. |
| 13c0 | 64 0b 00 19 7c 01 00 64 0c 00 19 21 66 04 00 56 01 71 0d 00 01 74 04 00 7c 02 00 83 01 00 82 01 | d...|..d...!f..V.q...t..|....... |
| 13e0 | 00 71 0d 00 57 64 0d 00 53 28 0e 00 00 00 73 ab 01 00 00 59 69 65 6c 64 20 73 65 71 75 65 6e 63 | .q..Wd..S(....s....Yield.sequenc |
| 1400 | 65 20 6f 66 20 6c 69 6e 65 20 67 72 6f 75 70 73 2e 20 20 45 61 63 68 20 6f 6e 65 20 69 73 20 61 | e.of.line.groups...Each.one.is.a |
| 1420 | 20 74 75 70 6c 65 3a 0a 0a 20 20 20 20 20 20 20 20 27 75 6e 63 68 61 6e 67 65 64 27 2c 20 6c 69 | .tuple:..........'unchanged',.li |
| 1440 | 6e 65 73 0a 20 20 20 20 20 20 20 20 20 20 20 20 20 4c 69 6e 65 73 20 75 6e 63 68 61 6e 67 65 64 | nes..............Lines.unchanged |
| 1460 | 20 66 72 6f 6d 20 62 61 73 65 0a 0a 20 20 20 20 20 20 20 20 27 61 27 2c 20 6c 69 6e 65 73 0a 20 | .from.base..........'a',.lines.. |
| 1480 | 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 61 0a 0a | ............Lines.taken.from.a.. |
| 14a0 | 20 20 20 20 20 20 20 20 27 73 61 6d 65 27 2c 20 6c 69 6e 65 73 0a 20 20 20 20 20 20 20 20 20 20 | ........'same',.lines........... |
| 14c0 | 20 20 20 4c 69 6e 65 73 20 74 61 6b 65 6e 20 66 72 6f 6d 20 61 20 28 61 6e 64 20 65 71 75 61 6c | ...Lines.taken.from.a.(and.equal |
| 14e0 | 20 74 6f 20 62 29 0a 0a 20 20 20 20 20 20 20 20 27 62 27 2c 20 6c 69 6e 65 73 0a 20 20 20 20 20 | .to.b)..........'b',.lines...... |
| 1500 | 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 62 0a 0a 20 20 20 20 | ........Lines.taken.from.b...... |
| 1520 | 20 20 20 20 27 63 6f 6e 66 6c 69 63 74 27 2c 20 62 61 73 65 5f 6c 69 6e 65 73 2c 20 61 5f 6c 69 | ....'conflict',.base_lines,.a_li |
| 1540 | 6e 65 73 2c 20 62 5f 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 | nes,.b_lines..............Lines. |
| 1560 | 66 72 6f 6d 20 62 61 73 65 20 77 65 72 65 20 63 68 61 6e 67 65 64 20 74 6f 20 65 69 74 68 65 72 | from.base.were.changed.to.either |
| 1580 | 20 61 20 6f 72 20 62 20 61 6e 64 20 63 6f 6e 66 6c 69 63 74 2e 0a 20 20 20 20 20 20 20 20 69 00 | .a.or.b.and.conflict..........i. |
| 15a0 | 00 00 00 52 23 00 00 00 69 01 00 00 00 69 02 00 00 00 52 10 00 00 00 52 24 00 00 00 52 13 00 00 | ...R#...i....i....R....R$...R... |
| 15c0 | 00 52 25 00 00 00 69 03 00 00 00 69 04 00 00 00 69 05 00 00 00 69 06 00 00 00 4e 28 05 00 00 00 | .R%...i....i....i....i....N(.... |
| 15e0 | 52 29 00 00 00 52 1f 00 00 00 52 10 00 00 00 52 13 00 00 00 52 2c 00 00 00 28 03 00 00 00 52 20 | R)...R....R....R....R,...(....R. |
| 1600 | 00 00 00 52 36 00 00 00 52 37 00 00 00 28 00 00 00 00 28 00 00 00 00 73 6a 00 00 00 2f 68 6f 6d | ...R6...R7...(....(....sj.../hom |
| 1620 | 65 2f 6e 69 73 68 61 6e 74 68 2f 44 65 73 6b 74 6f 70 2f 70 79 74 2d 62 6c 64 2f 70 79 74 61 73 | e/nishanth/Desktop/pyt-bld/pytas |
| 1640 | 6b 2f 65 67 67 73 2f 6d 65 72 63 75 72 69 61 6c 2d 31 2e 37 2e 33 2d 70 79 32 2e 36 2d 6c 69 6e | k/eggs/mercurial-1.7.3-py2.6-lin |
| 1660 | 75 78 2d 78 38 36 5f 36 34 2e 65 67 67 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 | ux-x86_64.egg/mercurial/simpleme |
| 1680 | 72 67 65 2e 70 79 74 0c 00 00 00 6d 65 72 67 65 5f 67 72 6f 75 70 73 a2 00 00 00 73 1e 00 00 00 | rge.pyt....merge_groups....s.... |
| 16a0 | 00 12 0d 00 06 01 0a 01 0d 01 21 01 1a 01 21 01 0d 01 21 01 0d 01 03 01 15 01 15 01 1e 02 63 01 | ..........!...!...!...........c. |
| 16c0 | 00 00 00 11 00 00 00 08 00 00 00 63 00 00 00 73 b0 01 00 00 64 01 00 04 7d 01 00 04 7d 02 00 7d | ...........c...s....d...}...}..} |
| 16e0 | 03 00 78 9b 01 7c 00 00 69 00 00 83 00 00 44 5d 8d 01 5c 06 00 7d 04 00 7d 05 00 7d 06 00 7d 07 | ..x..|..i.....D]..\..}..}..}..}. |
| 1700 | 00 7d 08 00 7d 09 00 7c 05 00 7c 04 00 18 7d 0a 00 7c 06 00 7c 02 00 18 7d 0b 00 7c 08 00 7c 03 | .}..}..|..|...}..|..|...}..|..|. |
| 1720 | 00 18 7d 0c 00 7c 04 00 7c 01 00 18 7d 0d 00 7c 0b 00 70 07 00 01 7c 0c 00 6f 08 01 01 74 01 00 | ..}..|..|...}..|..p...|..o...t.. |
| 1740 | 7c 00 00 69 02 00 7c 02 00 7c 06 00 7c 00 00 69 03 00 7c 01 00 7c 04 00 83 06 00 7d 0e 00 74 01 | |..i..|..|..|..i..|..|.....}..t. |
| 1760 | 00 7c 00 00 69 04 00 7c 03 00 7c 08 00 7c 00 00 69 03 00 7c 01 00 7c 04 00 83 06 00 7d 0f 00 74 | .|..i..|..|..|..i..|..|.....}..t |
| 1780 | 01 00 7c 00 00 69 02 00 7c 02 00 7c 06 00 7c 00 00 69 04 00 7c 03 00 7c 08 00 83 06 00 7d 10 00 | ..|..i..|..|..|..i..|..|.....}.. |
| 17a0 | 7c 10 00 6f 12 00 01 64 02 00 7c 02 00 7c 06 00 66 03 00 56 01 6e 7d 00 01 7c 0e 00 6f 1a 00 01 | |..o...d..|..|..f..V.n}..|..o... |
| 17c0 | 7c 0f 00 0c 6f 12 00 01 64 03 00 7c 03 00 7c 08 00 66 03 00 56 01 6e 5c 00 01 7c 0f 00 6f 1a 00 | |...o...d..|..|..f..V.n\..|..o.. |
| 17e0 | 01 7c 0e 00 0c 6f 12 00 01 64 04 00 7c 02 00 7c 06 00 66 03 00 56 01 6e 3b 00 01 7c 0e 00 0c 6f | .|...o...d..|..|..f..V.n;..|...o |
| 1800 | 26 00 01 7c 0f 00 0c 6f 1e 00 01 64 05 00 7c 01 00 7c 04 00 7c 02 00 7c 06 00 7c 03 00 7c 08 00 | &..|...o...d..|..|..|..|..|..|.. |
| 1820 | 66 07 00 56 01 6e 0d 00 01 74 05 00 64 06 00 83 01 00 82 01 00 7c 06 00 7d 02 00 7c 08 00 7d 03 | f..V.n...t..d........|..}..|..}. |
| 1840 | 00 6e 01 00 01 7c 04 00 7d 01 00 7c 0a 00 64 01 00 6a 04 00 6f 24 00 01 64 07 00 7c 04 00 7c 05 | .n...|..}..|..d..j..o$..d..|..|. |
| 1860 | 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 00 01 71 1b 00 57 | .f..V.|..}..|..}..|..}..q...q..W |
| 1880 | 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 6e 63 65 73 20 6f | d..S(....sp...Return.sequences.o |
| 18a0 | 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 20 72 65 67 69 6f | f.matching.and.conflicting.regio |
| 18c0 | 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 74 75 70 6c 65 73 | ns...........This.returns.tuples |
| 18e0 | 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 79 73 20 77 68 61 | ,.where.the.first.value.says.wha |
| 1900 | 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 20 20 20 20 20 20 | t.kind.we.........have:......... |
| 1920 | 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 20 20 20 20 20 20 | .'unchanged',.start,.end........ |
| 1940 | 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 65 5b 73 74 61 72 | ......Take.a.region.of.base[star |
| 1960 | 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 74 61 72 74 2c 20 | t:end]..........'same',.astart,. |
| 1980 | 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 61 72 65 20 64 69 | aend..............b.and.a.are.di |
| 19a0 | 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 20 74 68 65 20 73 | fferent.from.base.but.give.the.s |
| 19c0 | 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 74 61 72 74 2c 20 | ame.result..........'a',.start,. |
| 19e0 | 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 69 6e 67 20 69 6e | end..............Non-clashing.in |
| 1a00 | 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 0a 20 20 20 20 20 | sertion.from.a[start:end]....... |
| 1a20 | 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 20 20 20 20 20 20 | ...Method.is.as.follows:........ |
| 1a40 | 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 6f 6e 6c 79 20 6f | ..The.two.sequences.align.only.o |
| 1a60 | 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 62 61 73 65 0a 20 | n.regions.which.match.the.base.. |
| 1a80 | 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 73 2e 20 20 54 68 | .......and.both.descendents...Th |
| 1aa0 | 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 77 6f 2d 77 61 79 | ese.are.found.by.doing.a.two-way |
| 1ac0 | 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 61 67 61 69 6e 73 | .diff.........of.each.one.agains |
| 1ae0 | 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 6e 67 20 74 68 65 | t.the.base,.and.then.finding.the |
| 1b00 | 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 77 65 65 6e 20 74 | .........intersections.between.t |
| 1b20 | 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 20 72 65 67 69 6f | hose.regions...These."sync.regio |
| 1b40 | 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 69 6f 6e 20 75 6e | ns".........are.by.definition.un |
| 1b60 | 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 20 64 65 61 6c 74 | changed.in.both.and.easily.dealt |
| 1b80 | 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 73 20 69 6e 20 62 | .with...........The.regions.in.b |
| 1ba0 | 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 72 65 65 20 63 61 | etween.can.be.in.any.of.three.ca |
| 1bc0 | 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 72 20 63 68 61 6e | ses:.........conflicted,.or.chan |
| 1be0 | 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 20 20 20 20 69 00 | ged.on.only.one.side..........i. |
| 1c00 | 00 00 00 52 24 00 00 00 52 13 00 00 00 52 10 00 00 00 52 25 00 00 00 73 23 00 00 00 63 61 6e 27 | ...R$...R....R....R%...s#...can' |
| 1c20 | 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 74 63 68 65 64 52 | t.handle.a=b=base.but.unmatchedR |
| 1c40 | 23 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 65 67 69 6f 6e 73 | #...N(....t....find_sync_regions |
| 1c60 | 52 18 00 00 00 52 10 00 00 00 52 1f 00 00 00 52 13 00 00 00 74 0e 00 00 00 41 73 73 65 72 74 69 | R....R....R....R....t....Asserti |
| 1c80 | 6f 6e 45 72 72 6f 72 28 11 00 00 00 52 20 00 00 00 74 02 00 00 00 69 7a 52 16 00 00 00 52 17 00 | onError(....R....t....izR....R.. |
| 1ca0 | 00 00 74 06 00 00 00 7a 6d 61 74 63 68 74 04 00 00 00 7a 65 6e 64 74 06 00 00 00 61 6d 61 74 63 | ..t....zmatcht....zendt....amatc |
| 1cc0 | 68 52 12 00 00 00 74 06 00 00 00 62 6d 61 74 63 68 52 15 00 00 00 74 08 00 00 00 6d 61 74 63 68 | hR....t....bmatchR....t....match |
| 1ce0 | 6c 65 6e 74 05 00 00 00 6c 65 6e 5f 61 74 05 00 00 00 6c 65 6e 5f 62 74 08 00 00 00 6c 65 6e 5f | lent....len_at....len_bt....len_ |
| 1d00 | 62 61 73 65 74 07 00 00 00 65 71 75 61 6c 5f 61 74 07 00 00 00 65 71 75 61 6c 5f 62 52 24 00 00 | baset....equal_at....equal_bR$.. |
| 1d20 | 00 28 00 00 00 00 28 00 00 00 00 73 6a 00 00 00 2f 68 6f 6d 65 2f 6e 69 73 68 61 6e 74 68 2f 44 | .(....(....sj.../home/nishanth/D |
| 1d40 | 65 73 6b 74 6f 70 2f 70 79 74 2d 62 6c 64 2f 70 79 74 61 73 6b 2f 65 67 67 73 2f 6d 65 72 63 75 | esktop/pyt-bld/pytask/eggs/mercu |
| 1d60 | 72 69 61 6c 2d 31 2e 37 2e 33 2d 70 79 32 2e 36 2d 6c 69 6e 75 78 2d 78 38 36 5f 36 34 2e 65 67 | rial-1.7.3-py2.6-linux-x86_64.eg |
| 1d80 | 67 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 29 00 00 00 c4 | g/mercurial/simplemerge.pyR).... |
| 1da0 | 00 00 00 73 3e 00 00 00 00 1c 0e 02 0d 00 18 03 0a 05 0a 01 0a 01 0a 07 0e 02 0f 01 12 01 0f 01 | ...s>........................... |
| 1dc0 | 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 0d 05 | ................................ |
| 1de0 | 0e 01 06 01 06 01 63 02 00 00 00 13 00 00 00 0b 00 00 00 63 00 00 00 73 51 01 00 00 78 4a 01 7c | ......c............c...sQ...xJ.| |
| 1e00 | 01 00 44 5d 42 01 7d 02 00 7c 02 00 64 01 00 19 64 02 00 6a 03 00 6f 0c 00 01 7c 02 00 56 01 71 | ..D]B.}..|..d...d..j..o...|..V.q |
| 1e20 | 07 00 6e 01 00 01 7c 02 00 5c 07 00 7d 03 00 7d 04 00 7d 05 00 7d 06 00 7d 07 00 7d 08 00 7d 09 | ..n...|..\..}..}..}..}..}..}..}. |
| 1e40 | 00 7c 00 00 69 00 00 7c 06 00 7c 07 00 21 7d 0a 00 7c 00 00 69 01 00 7c 08 00 7c 09 00 21 7d 0b | .|..i..|..|..!}..|..i..|..|..!}. |
| 1e60 | 00 74 02 00 69 03 00 64 03 00 69 04 00 7c 0a 00 83 01 00 64 03 00 69 04 00 7c 0b 00 83 01 00 83 | .t..i..d..i..|.....d..i..|...... |
| 1e80 | 02 00 7d 0c 00 7c 06 00 7d 0d 00 7c 08 00 7d 0e 00 78 83 00 7c 0c 00 64 04 00 20 44 5d 77 00 5c | ..}..|..}..|..}..x..|..d...D]w.\ |
| 1ea0 | 03 00 7d 0f 00 7d 10 00 7d 11 00 7c 0f 00 7c 06 00 37 7d 0f 00 7c 10 00 7c 08 00 37 7d 10 00 7c | ..}..}..}..|..|..7}..|..|..7}..| |
| 1ec0 | 00 00 69 05 00 7c 0d 00 7c 0f 00 7c 0e 00 7c 10 00 83 04 00 7d 12 00 7c 12 00 64 06 00 6a 09 00 | ..i..|..|..|..|.....}..|..d..j.. |
| 1ee0 | 6f 09 00 01 7c 12 00 56 01 6e 01 00 01 64 05 00 7c 0f 00 7c 11 00 7c 0f 00 17 66 03 00 56 01 7c | o...|..V.n...d..|..|..|...f..V.| |
| 1f00 | 0f 00 7c 11 00 17 7d 0d 00 7c 10 00 7c 11 00 17 7d 0e 00 71 a0 00 57 7c 00 00 69 05 00 7c 0d 00 | ..|...}..|..|...}..q..W|..i..|.. |
| 1f20 | 7c 07 00 7c 0e 00 7c 09 00 83 04 00 7d 12 00 7c 12 00 64 06 00 6a 09 00 6f 09 00 01 7c 12 00 56 | |..|..|.....}..|..d..j..o...|..V |
| 1f40 | 01 71 07 00 01 71 07 00 57 64 06 00 53 28 07 00 00 00 73 98 00 00 00 57 68 65 72 65 20 74 68 65 | .q...q..Wd..S(....s....Where.the |
| 1f60 | 72 65 20 61 72 65 20 63 6f 6e 66 6c 69 63 74 20 72 65 67 69 6f 6e 73 2c 20 72 65 6d 6f 76 65 20 | re.are.conflict.regions,.remove. |
| 1f80 | 74 68 65 20 61 67 72 65 65 64 20 6c 69 6e 65 73 2e 0a 0a 20 20 20 20 20 20 20 20 4c 69 6e 65 73 | the.agreed.lines...........Lines |
| 1fa0 | 20 77 68 65 72 65 20 62 6f 74 68 20 41 20 61 6e 64 20 42 20 68 61 76 65 20 6d 61 64 65 20 74 68 | .where.both.A.and.B.have.made.th |
| 1fc0 | 65 20 73 61 6d 65 20 63 68 61 6e 67 65 73 20 61 72 65 0a 20 20 20 20 20 20 20 20 65 6c 69 6d 69 | e.same.changes.are.........elimi |
| 1fe0 | 6e 61 74 65 64 2e 0a 20 20 20 20 20 20 20 20 69 00 00 00 00 52 25 00 00 00 74 00 00 00 00 69 ff | nated..........i....R%...t....i. |
| 2000 | ff ff ff 52 24 00 00 00 4e 28 07 00 00 00 52 10 00 00 00 52 13 00 00 00 52 1d 00 00 00 74 13 00 | ...R$...N(....R....R....R....t.. |
| 2020 | 00 00 67 65 74 5f 6d 61 74 63 68 69 6e 67 5f 62 6c 6f 63 6b 73 74 04 00 00 00 6a 6f 69 6e 74 0f | ..get_matching_blockst....joint. |
| 2040 | 00 00 00 6d 69 73 6d 61 74 63 68 5f 72 65 67 69 6f 6e 52 06 00 00 00 28 13 00 00 00 52 20 00 00 | ...mismatch_regionR....(....R... |
| 2060 | 00 52 29 00 00 00 74 06 00 00 00 72 65 67 69 6f 6e 74 04 00 00 00 74 79 70 65 52 3e 00 00 00 52 | .R)...t....regiont....typeR>...R |
| 2080 | 3f 00 00 00 52 16 00 00 00 52 41 00 00 00 52 17 00 00 00 52 42 00 00 00 74 08 00 00 00 61 5f 72 | ?...R....RA...R....RB...t....a_r |
| 20a0 | 65 67 69 6f 6e 74 08 00 00 00 62 5f 72 65 67 69 6f 6e 74 07 00 00 00 6d 61 74 63 68 65 73 74 06 | egiont....b_regiont....matchest. |
| 20c0 | 00 00 00 6e 65 78 74 5f 61 74 06 00 00 00 6e 65 78 74 5f 62 74 09 00 00 00 72 65 67 69 6f 6e 5f | ...next_at....next_bt....region_ |
| 20e0 | 69 61 74 09 00 00 00 72 65 67 69 6f 6e 5f 69 62 74 0a 00 00 00 72 65 67 69 6f 6e 5f 6c 65 6e 74 | iat....region_ibt....region_lent |
| 2100 | 03 00 00 00 72 65 67 28 00 00 00 00 28 00 00 00 00 73 6a 00 00 00 2f 68 6f 6d 65 2f 6e 69 73 68 | ....reg(....(....sj.../home/nish |
| 2120 | 61 6e 74 68 2f 44 65 73 6b 74 6f 70 2f 70 79 74 2d 62 6c 64 2f 70 79 74 61 73 6b 2f 65 67 67 73 | anth/Desktop/pyt-bld/pytask/eggs |
| 2140 | 2f 6d 65 72 63 75 72 69 61 6c 2d 31 2e 37 2e 33 2d 70 79 32 2e 36 2d 6c 69 6e 75 78 2d 78 38 36 | /mercurial-1.7.3-py2.6-linux-x86 |
| 2160 | 5f 36 34 2e 65 67 67 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 | _64.egg/mercurial/simplemerge.py |
| 2180 | 52 2a 00 00 00 19 01 00 00 73 34 00 00 00 00 06 07 00 06 01 11 01 05 01 07 01 1b 01 10 01 10 01 | R*.......s4..................... |
| 21a0 | 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 0a 01 0e 01 18 01 | ................................ |
| 21c0 | 0d 01 63 04 00 00 00 04 00 00 00 07 00 00 00 43 00 00 00 73 38 00 00 00 7c 00 00 7c 01 00 6a 00 | ..c............C...s8...|..|..j. |
| 21e0 | 00 70 0d 00 01 7c 02 00 7c 03 00 6a 00 00 6f 1a 00 01 64 01 00 64 00 00 64 00 00 7c 00 00 7c 01 | .p...|..|..j..o...d..d..d..|..|. |
| 2200 | 00 7c 02 00 7c 03 00 66 07 00 53 01 64 00 00 53 28 02 00 00 00 4e 52 25 00 00 00 28 01 00 00 00 | .|..|..f..S.d..S(....NR%...(.... |
| 2220 | 52 06 00 00 00 28 04 00 00 00 52 52 00 00 00 52 54 00 00 00 52 53 00 00 00 52 55 00 00 00 28 00 | R....(....RR...RT...RS...RU...(. |
| 2240 | 00 00 00 28 00 00 00 00 73 6a 00 00 00 2f 68 6f 6d 65 2f 6e 69 73 68 61 6e 74 68 2f 44 65 73 6b | ...(....sj.../home/nishanth/Desk |
| 2260 | 74 6f 70 2f 70 79 74 2d 62 6c 64 2f 70 79 74 61 73 6b 2f 65 67 67 73 2f 6d 65 72 63 75 72 69 61 | top/pyt-bld/pytask/eggs/mercuria |
| 2280 | 6c 2d 31 2e 37 2e 33 2d 70 79 32 2e 36 2d 6c 69 6e 75 78 2d 78 38 36 5f 36 34 2e 65 67 67 2f 6d | l-1.7.3-py2.6-linux-x86_64.egg/m |
| 22a0 | 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 00 00 00 38 01 00 00 | ercurial/simplemerge.pyRL...8... |
| 22c0 | 73 04 00 00 00 00 01 1a 01 63 01 00 00 00 16 00 00 00 07 00 00 00 43 00 00 00 73 b8 01 00 00 64 | s........c............C...s....d |
| 22e0 | 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 03 00 83 02 00 7d 03 | ...}..}..t..i..|..i..|..i.....}. |
| 2300 | 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 74 05 00 7c 03 00 83 | .t..i..|..i..|..i.....}..t..|... |
| 2320 | 01 00 7d 05 00 74 05 00 7c 04 00 83 01 00 7d 06 00 67 00 00 7d 07 00 78 0d 01 7c 01 00 7c 05 00 | ..}..t..|.....}..g..}..x..|..|.. |
| 2340 | 6a 00 00 6f ff 00 01 7c 02 00 7c 06 00 6a 00 00 6f f2 00 01 7c 03 00 7c 01 00 19 5c 03 00 7d 08 | j..o...|..|..j..o...|..|...\..}. |
| 2360 | 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 00 74 06 00 7c 08 00 | .}..}..|..|...\..}..}..}..t..|.. |
| 2380 | 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 00 7d 0e 00 7c 0e 00 | |..|...f..|..|..|...f.....}..|.. |
| 23a0 | 6f 71 00 01 7c 0e 00 64 01 00 19 7d 0f 00 7c 0e 00 64 02 00 19 7d 10 00 7c 10 00 7c 0f 00 18 7d | oq..|..d...}..|..d...}..|..|...} |
| 23c0 | 11 00 7c 09 00 7c 0f 00 7c 08 00 18 17 7d 12 00 7c 0c 00 7c 0f 00 7c 0b 00 18 17 7d 13 00 7c 12 | ..|..|..|....}..|..|..|....}..|. |
| 23e0 | 00 7c 11 00 17 7d 14 00 7c 13 00 7c 11 00 17 7d 15 00 7c 07 00 69 07 00 7c 0f 00 7c 10 00 7c 12 | .|...}..|..|...}..|..i..|..|..|. |
| 2400 | 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 7c 0b 00 7c | .|..|..|..f......n...|..|...|..| |
| 2420 | 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 02 00 37 7d | ...j..o...|..d..7}..q[..|..d..7} |
| 2440 | 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 69 09 00 83 | ..q[..Wt..|..i.....}..t..|..i... |
| 2460 | 01 00 7d 08 00 74 05 00 7c 00 00 69 0a 00 83 01 00 7d 0b 00 7c 07 00 69 07 00 7c 0f 00 7c 0f 00 | ..}..t..|..i.....}..|..i..|..|.. |
| 2480 | 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 73 db 00 00 | |..|..|..|..f......|..S(....s... |
| 24a0 | 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 6e 73 2c 20 | .Return.a.list.of.sync.regions,. |
| 24c0 | 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 20 74 68 65 | where.both.descendents.match.the |
| 24e0 | 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 6c 69 73 74 | .base...........Generates.a.list |
| 2500 | 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 31 2c 20 62 | .of.(base1,.base2,.a1,.a2,.b1,.b |
| 2520 | 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 20 61 20 7a | 2)...There.is.........always.a.z |
| 2540 | 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 65 20 65 6e | ero-length.sync.region.at.the.en |
| 2560 | 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 69 00 00 00 | d.of.all.the.files..........i... |
| 2580 | 00 69 01 00 00 00 28 0b 00 00 00 52 1d 00 00 00 52 4a 00 00 00 52 1a 00 00 00 52 1b 00 00 00 52 | .i....(....R....RJ...R....R....R |
| 25a0 | 1c 00 00 00 52 27 00 00 00 52 0b 00 00 00 74 06 00 00 00 61 70 70 65 6e 64 52 1f 00 00 00 52 10 | ....R'...R....t....appendR....R. |
| 25c0 | 00 00 00 52 13 00 00 00 28 16 00 00 00 52 20 00 00 00 52 16 00 00 00 52 17 00 00 00 74 08 00 00 | ...R....(....R....R....R....t... |
| 25e0 | 00 61 6d 61 74 63 68 65 73 74 08 00 00 00 62 6d 61 74 63 68 65 73 52 44 00 00 00 52 45 00 00 00 | .amatchest....bmatchesRD...RE... |
| 2600 | 74 02 00 00 00 73 6c 74 05 00 00 00 61 62 61 73 65 52 41 00 00 00 74 04 00 00 00 61 6c 65 6e 74 | t....slt....abaseRA...t....alent |
| 2620 | 05 00 00 00 62 62 61 73 65 52 42 00 00 00 74 04 00 00 00 62 6c 65 6e 52 38 00 00 00 74 07 00 00 | ....bbaseRB...t....blenR8...t... |
| 2640 | 00 69 6e 74 62 61 73 65 74 06 00 00 00 69 6e 74 65 6e 64 74 06 00 00 00 69 6e 74 6c 65 6e 74 04 | .intbaset....intendt....intlent. |
| 2660 | 00 00 00 61 73 75 62 74 04 00 00 00 62 73 75 62 52 12 00 00 00 52 15 00 00 00 28 00 00 00 00 28 | ...asubt....bsubR....R....(....( |
| 2680 | 00 00 00 00 73 6a 00 00 00 2f 68 6f 6d 65 2f 6e 69 73 68 61 6e 74 68 2f 44 65 73 6b 74 6f 70 2f | ....sj.../home/nishanth/Desktop/ |
| 26a0 | 70 79 74 2d 62 6c 64 2f 70 79 74 61 73 6b 2f 65 67 67 73 2f 6d 65 72 63 75 72 69 61 6c 2d 31 2e | pyt-bld/pytask/eggs/mercurial-1. |
| 26c0 | 37 2e 33 2d 70 79 32 2e 36 2d 6c 69 6e 75 78 2d 78 38 36 5f 36 34 2e 65 67 67 2f 6d 65 72 63 75 | 7.3-py2.6-linux-x86_64.egg/mercu |
| 26e0 | 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 2e 70 79 52 3c 00 00 00 3d 01 00 00 73 3c 00 00 | rial/simplemerge.pyR<...=...s<.. |
| 2700 | 00 00 07 0a 01 18 01 18 01 0c 01 0c 02 06 02 03 00 1a 01 13 01 13 04 23 01 07 01 0a 01 0a 01 0a | .......................#........ |
| 2720 | 09 0e 01 0e 01 0a 01 0a 07 0c 01 06 01 11 03 15 01 0e 02 0f 02 0f 01 0f 01 0f 01 1f 02 63 01 00 | .............................c.. |
| 2740 | 00 00 09 00 00 00 04 00 00 00 43 00 00 00 73 e2 00 00 00 74 00 00 69 01 00 7c 00 00 69 02 00 7c | ..........C...s....t..i..|..i..| |
| 2760 | 00 00 69 03 00 83 02 00 7d 01 00 74 00 00 69 01 00 7c 00 00 69 02 00 7c 00 00 69 04 00 83 02 00 | ..i.....}..t..i..|..i..|..i..... |
| 2780 | 7d 02 00 67 00 00 7d 03 00 78 a5 00 7c 01 00 6f 9d 00 01 7c 02 00 6f 96 00 01 7c 01 00 64 01 00 | }..g..}..x..|..o...|..o...|..d.. |
| 27a0 | 19 64 01 00 19 7d 04 00 7c 04 00 7c 01 00 64 01 00 19 64 02 00 19 17 7d 05 00 7c 02 00 64 01 00 | .d...}..|..|..d...d....}..|..d.. |
| 27c0 | 19 64 01 00 19 7d 06 00 7c 06 00 7c 02 00 64 01 00 19 64 02 00 19 17 7d 07 00 74 05 00 7c 04 00 | .d...}..|..|..d...d....}..t..|.. |
| 27e0 | 7c 05 00 66 02 00 7c 06 00 7c 07 00 66 02 00 83 02 00 7d 08 00 7c 08 00 6f 11 00 01 7c 03 00 69 | |..f..|..|..f.....}..|..o...|..i |
| 2800 | 06 00 7c 08 00 83 01 00 01 6e 01 00 01 7c 05 00 7c 07 00 6a 00 00 6f 0b 00 01 7c 01 00 64 01 00 | ..|......n...|..|..j..o...|..d.. |
| 2820 | 3d 71 39 00 01 7c 02 00 64 01 00 3d 71 39 00 01 57 7c 03 00 53 28 03 00 00 00 73 38 00 00 00 52 | =q9..|..d..=q9..W|..S(....s8...R |
| 2840 | 65 74 75 72 6e 20 61 20 6c 69 73 74 20 6f 66 20 72 61 6e 67 65 73 20 69 6e 20 62 61 73 65 20 74 | eturn.a.list.of.ranges.in.base.t |
| 2860 | 68 61 74 20 61 72 65 20 6e 6f 74 20 63 6f 6e 66 6c 69 63 74 65 64 2e 69 00 00 00 00 69 02 00 00 | hat.are.not.conflicted.i....i... |
| 2880 | 00 28 07 00 00 00 52 1d 00 00 00 52 4a 00 00 00 52 1a 00 00 00 52 1b 00 00 00 52 1c 00 00 00 52 | .(....R....RJ...R....R....R....R |
| 28a0 | 0b 00 00 00 52 58 00 00 00 28 09 00 00 00 52 20 00 00 00 74 02 00 00 00 61 6d 74 02 00 00 00 62 | ....RX...(....R....t....amt....b |
| 28c0 | 6d 74 03 00 00 00 75 6e 63 74 02 00 00 00 61 31 74 02 00 00 00 61 32 74 02 00 00 00 62 31 74 02 | mt....unct....a1t....a2t....b1t. |
| 28e0 | 00 00 00 62 32 52 38 00 00 00 28 00 00 00 00 28 00 00 00 00 73 6a 00 00 00 2f 68 6f 6d 65 2f 6e | ...b2R8...(....(....sj.../home/n |
| 2900 | 69 73 68 61 6e 74 68 2f 44 65 73 6b 74 6f 70 2f 70 79 74 2d 62 6c 64 2f 70 79 74 61 73 6b 2f 65 | ishanth/Desktop/pyt-bld/pytask/e |
| 2920 | 67 67 73 2f 6d 65 72 63 75 72 69 61 6c 2d 31 2e 37 2e 33 2d 70 79 32 2e 36 2d 6c 69 6e 75 78 2d | ggs/mercurial-1.7.3-py2.6-linux- |
| 2940 | 78 38 36 5f 36 34 2e 65 67 67 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 65 | x86_64.egg/mercurial/simplemerge |
| 2960 | 2e 70 79 74 11 00 00 00 66 69 6e 64 5f 75 6e 63 6f 6e 66 6c 69 63 74 65 64 7a 01 00 00 73 20 00 | .pyt....find_unconflictedz...s.. |
| 2980 | 00 00 00 02 18 01 18 02 06 02 03 00 0e 03 0e 01 12 01 0e 01 12 01 1b 01 07 01 11 02 0d 01 0b 02 | ................................ |
| 29a0 | 0c 02 4e 28 0f 00 00 00 52 02 00 00 00 52 03 00 00 00 74 07 00 00 00 5f 5f 64 6f 63 5f 5f 52 06 | ..N(....R....R....t....__doc__R. |
| 29c0 | 00 00 00 52 21 00 00 00 52 0c 00 00 00 52 39 00 00 00 52 3a 00 00 00 52 3b 00 00 00 52 29 00 00 | ...R!...R....R9...R:...R;...R).. |
| 29e0 | 00 52 2a 00 00 00 52 4c 00 00 00 74 0c 00 00 00 73 74 61 74 69 63 6d 65 74 68 6f 64 52 3c 00 00 | .R*...RL...t....staticmethodR<.. |
| 2a00 | 00 52 6c 00 00 00 28 00 00 00 00 28 00 00 00 00 28 00 00 00 00 73 6a 00 00 00 2f 68 6f 6d 65 2f | .Rl...(....(....(....sj.../home/ |
| 2a20 | 6e 69 73 68 61 6e 74 68 2f 44 65 73 6b 74 6f 70 2f 70 79 74 2d 62 6c 64 2f 70 79 74 61 73 6b 2f | nishanth/Desktop/pyt-bld/pytask/ |
| 2a40 | 65 67 67 73 2f 6d 65 72 63 75 72 69 61 6c 2d 31 2e 37 2e 33 2d 70 79 32 2e 36 2d 6c 69 6e 75 78 | eggs/mercurial-1.7.3-py2.6-linux |
| 2a60 | 2d 78 38 36 5f 36 34 2e 65 67 67 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d 70 6c 65 6d 65 72 67 | -x86_64.egg/mercurial/simplemerg |
| 2a80 | 65 2e 70 79 52 19 00 00 00 3c 00 00 00 73 24 00 00 00 06 04 06 01 12 0f 03 01 03 01 03 01 03 01 | e.pyR....<...s$................. |
| 2aa0 | 03 01 03 01 03 01 0c 30 09 1b 09 22 09 55 09 1f 09 03 0c 02 09 3d 63 04 00 00 00 11 00 00 00 08 | .......0...".U.......=c......... |
| 2ac0 | 00 00 00 0b 00 00 00 73 c3 01 00 00 87 00 00 87 01 00 66 02 00 64 01 00 86 00 00 7d 05 00 7c 01 | .......s..........f..d.....}..|. |
| 2ae0 | 00 7d 06 00 7c 03 00 7d 07 00 88 01 00 69 00 00 64 02 00 67 00 00 83 02 00 7d 08 00 7c 08 00 6f | .}..|..}.....i..d..g.....}..|..o |
| 2b00 | 13 00 01 7c 08 00 69 01 00 64 03 00 83 01 00 7d 06 00 6e 01 00 01 7c 08 00 6f 13 00 01 7c 08 00 | ...|..i..d.....}..n...|..o...|.. |
| 2b20 | 69 01 00 64 03 00 83 01 00 7d 07 00 6e 01 00 01 7c 08 00 6f 19 00 01 74 02 00 69 03 00 74 04 00 | i..d.....}..n...|..o...t..i..t.. |
| 2b40 | 64 04 00 83 01 00 83 01 00 82 01 00 6e 01 00 01 7c 05 00 7c 01 00 83 01 00 7d 09 00 7c 05 00 7c | d...........n...|..|.....}..|..| |
| 2b60 | 02 00 83 01 00 7d 0a 00 7c 05 00 7c 03 00 83 01 00 7d 0b 00 74 05 00 69 06 00 69 07 00 7c 01 00 | .....}..|..|.....}..t..i..i..|.. |
| 2b80 | 83 01 00 7d 01 00 88 01 00 69 00 00 64 05 00 83 01 00 70 40 00 01 74 02 00 69 08 00 74 05 00 69 | ...}.....i..d.....p@..t..i..t..i |
| 2ba0 | 06 00 69 09 00 7c 01 00 83 01 00 83 01 00 7d 0c 00 7c 0c 00 74 05 00 69 06 00 69 0a 00 7c 01 00 | ..i..|........}..|..t..i..i..|.. |
| 2bc0 | 83 01 00 64 06 00 64 07 00 74 0b 00 83 02 01 7d 0d 00 6e 0a 00 01 74 0c 00 69 0d 00 7d 0d 00 88 | ...d..d..t.....}..n...t..i..}... |
| 2be0 | 01 00 69 00 00 64 08 00 83 01 00 0c 7d 0e 00 74 0e 00 7c 0a 00 7c 09 00 7c 0b 00 83 03 00 7d 0f | ..i..d......}..t..|..|..|.....}. |
| 2c00 | 00 78 33 00 7c 0f 00 69 0f 00 64 09 00 7c 06 00 64 0a 00 7c 07 00 64 0b 00 7c 0e 00 83 00 03 44 | .x3.|..i..d..|..d..|..d..|.....D |
| 2c20 | 5d 13 00 7d 10 00 7c 0d 00 69 10 00 7c 10 00 83 01 00 01 71 54 01 57 88 01 00 69 00 00 64 05 00 | ]..}..|..i..|......qT.W...i..d.. |
| 2c40 | 83 01 00 70 0e 00 01 7c 0d 00 69 11 00 83 00 00 01 6e 01 00 01 7c 0f 00 69 12 00 6f 2c 00 01 88 | ...p...|..i......n...|..i..o,... |
| 2c60 | 01 00 69 00 00 64 0c 00 83 01 00 70 17 00 01 88 00 00 69 13 00 74 04 00 64 0d 00 83 01 00 83 01 | ..i..d.....p......i..t..d....... |
| 2c80 | 00 01 6e 01 00 01 64 0e 00 53 01 64 00 00 53 28 0f 00 00 00 4e 63 01 00 00 00 04 00 00 00 03 00 | ..n...d..S.d..S(....Nc.......... |
| 2ca0 | 00 00 13 00 00 00 73 9b 00 00 00 74 00 00 7c 00 00 64 01 00 83 02 00 7d 01 00 7c 01 00 69 01 00 | ......s....t..|..d.....}..|..i.. |
| 2cc0 | 83 00 00 7d 02 00 7c 01 00 69 02 00 83 00 00 01 74 03 00 69 04 00 7c 02 00 83 01 00 6f 62 00 01 | ...}..|..i......t..i..|.....ob.. |
| 2ce0 | 74 05 00 64 02 00 83 01 00 7c 00 00 16 7d 03 00 88 01 00 69 06 00 64 03 00 83 01 00 70 13 00 01 | t..d.....|...}.....i..d.....p... |
| 2d00 | 74 03 00 69 07 00 7c 03 00 83 01 00 82 01 00 71 97 00 01 88 01 00 69 06 00 64 04 00 83 01 00 70 | t..i..|........q......i..d.....p |
| 2d20 | 1b 00 01 88 00 00 69 08 00 74 05 00 64 05 00 83 01 00 7c 03 00 16 83 01 00 01 71 97 00 01 6e 01 | ......i..t..d.....|.......q...n. |
| 2d40 | 00 01 7c 02 00 53 28 06 00 00 00 4e 52 08 00 00 00 73 1c 00 00 00 25 73 20 6c 6f 6f 6b 73 20 6c | ..|..S(....NR....s....%s.looks.l |
| 2d60 | 69 6b 65 20 61 20 62 69 6e 61 72 79 20 66 69 6c 65 2e 74 04 00 00 00 74 65 78 74 74 05 00 00 00 | ike.a.binary.file.t....textt.... |
| 2d80 | 71 75 69 65 74 73 0c 00 00 00 77 61 72 6e 69 6e 67 3a 20 25 73 0a 28 09 00 00 00 74 04 00 00 00 | quiets....warning:.%s.(....t.... |
| 2da0 | 6f 70 65 6e 74 04 00 00 00 72 65 61 64 74 05 00 00 00 63 6c 6f 73 65 74 04 00 00 00 75 74 69 6c | opent....readt....closet....util |
| 2dc0 | 74 06 00 00 00 62 69 6e 61 72 79 52 00 00 00 00 74 03 00 00 00 67 65 74 74 05 00 00 00 41 62 6f | t....binaryR....t....gett....Abo |
| 2de0 | 72 74 74 04 00 00 00 77 61 72 6e 28 04 00 00 00 74 08 00 00 00 66 69 6c 65 6e 61 6d 65 74 01 00 | rtt....warn(....t....filenamet.. |
| 2e00 | 00 00 66 52 6f 00 00 00 74 03 00 00 00 6d 73 67 28 02 00 00 00 74 02 00 00 00 75 69 74 04 00 00 | ..fRo...t....msg(....t....uit... |
| 2e20 | 00 6f 70 74 73 28 00 00 00 00 73 6a 00 00 00 2f 68 6f 6d 65 2f 6e 69 73 68 61 6e 74 68 2f 44 65 | .opts(....sj.../home/nishanth/De |
| 2e40 | 73 6b 74 6f 70 2f 70 79 74 2d 62 6c 64 2f 70 79 74 61 73 6b 2f 65 67 67 73 2f 6d 65 72 63 75 72 | sktop/pyt-bld/pytask/eggs/mercur |
| 2e60 | 69 61 6c 2d 31 2e 37 2e 33 2d 70 79 32 2e 36 2d 6c 69 6e 75 78 2d 78 38 36 5f 36 34 2e 65 67 67 | ial-1.7.3-py2.6-linux-x86_64.egg |
| 2e80 | 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 00 72 65 | /mercurial/simplemerge.pyt....re |
| 2ea0 | 61 64 66 69 6c 65 94 01 00 00 73 14 00 00 00 00 01 0f 01 0c 01 0a 01 10 01 10 01 10 01 13 01 10 | adfile....s..................... |
| 2ec0 | 01 1f 01 74 05 00 00 00 6c 61 62 65 6c 69 00 00 00 00 73 1c 00 00 00 63 61 6e 20 6f 6e 6c 79 20 | ...t....labeli....s....can.only. |
| 2ee0 | 73 70 65 63 69 66 79 20 74 77 6f 20 6c 61 62 65 6c 73 2e 74 05 00 00 00 70 72 69 6e 74 74 01 00 | specify.two.labels.t....printt.. |
| 2f00 | 00 00 77 74 0a 00 00 00 61 74 6f 6d 69 63 74 65 6d 70 74 0a 00 00 00 6e 6f 5f 6d 69 6e 69 6d 61 | ..wt....atomictempt....no_minima |
| 2f20 | 6c 52 2d 00 00 00 52 2e 00 00 00 52 34 00 00 00 52 70 00 00 00 73 21 00 00 00 77 61 72 6e 69 6e | lR-...R....R4...Rp...s!...warnin |
| 2f40 | 67 3a 20 63 6f 6e 66 6c 69 63 74 73 20 64 75 72 69 6e 67 20 6d 65 72 67 65 2e 0a 69 01 00 00 00 | g:.conflicts.during.merge..i.... |
| 2f60 | 28 14 00 00 00 52 76 00 00 00 74 03 00 00 00 70 6f 70 52 74 00 00 00 52 77 00 00 00 52 00 00 00 | (....Rv...t....popRt...Rw...R... |
| 2f80 | 00 74 02 00 00 00 6f 73 74 04 00 00 00 70 61 74 68 74 08 00 00 00 72 65 61 6c 70 61 74 68 74 06 | .t....ost....patht....realpatht. |
| 2fa0 | 00 00 00 6f 70 65 6e 65 72 74 07 00 00 00 64 69 72 6e 61 6d 65 74 08 00 00 00 62 61 73 65 6e 61 | ...openert....dirnamet....basena |
| 2fc0 | 6d 65 52 0f 00 00 00 74 03 00 00 00 73 79 73 74 06 00 00 00 73 74 64 6f 75 74 52 19 00 00 00 52 | meR....t....syst....stdoutR....R |
| 2fe0 | 39 00 00 00 74 05 00 00 00 77 72 69 74 65 74 06 00 00 00 72 65 6e 61 6d 65 52 26 00 00 00 52 78 | 9...t....writet....renameR&...Rx |
| 3000 | 00 00 00 28 11 00 00 00 52 7c 00 00 00 74 05 00 00 00 6c 6f 63 61 6c 52 1f 00 00 00 74 05 00 00 | ...(....R|...t....localR....t... |
| 3020 | 00 6f 74 68 65 72 52 7d 00 00 00 52 7e 00 00 00 52 2d 00 00 00 52 2e 00 00 00 74 06 00 00 00 6c | .otherR}...R~...R-...R....t....l |
| 3040 | 61 62 65 6c 73 74 09 00 00 00 6c 6f 63 61 6c 74 65 78 74 52 1a 00 00 00 74 09 00 00 00 6f 74 68 | abelst....localtextR....t....oth |
| 3060 | 65 72 74 65 78 74 52 88 00 00 00 74 03 00 00 00 6f 75 74 52 34 00 00 00 74 02 00 00 00 6d 33 74 | ertextR....t....outR4...t....m3t |
| 3080 | 04 00 00 00 6c 69 6e 65 28 00 00 00 00 28 02 00 00 00 52 7c 00 00 00 52 7d 00 00 00 73 6a 00 00 | ....line(....(....R|...R}...sj.. |
| 30a0 | 00 2f 68 6f 6d 65 2f 6e 69 73 68 61 6e 74 68 2f 44 65 73 6b 74 6f 70 2f 70 79 74 2d 62 6c 64 2f | ./home/nishanth/Desktop/pyt-bld/ |
| 30c0 | 70 79 74 61 73 6b 2f 65 67 67 73 2f 6d 65 72 63 75 72 69 61 6c 2d 31 2e 37 2e 33 2d 70 79 32 2e | pytask/eggs/mercurial-1.7.3-py2. |
| 30e0 | 36 2d 6c 69 6e 75 78 2d 78 38 36 5f 36 34 2e 65 67 67 2f 6d 65 72 63 75 72 69 61 6c 2f 73 69 6d | 6-linux-x86_64.egg/mercurial/sim |
| 3100 | 70 6c 65 6d 65 72 67 65 2e 70 79 74 0b 00 00 00 73 69 6d 70 6c 65 6d 65 72 67 65 93 01 00 00 73 | plemerge.pyt....simplemerge....s |
| 3120 | 3c 00 00 00 00 01 12 0c 06 01 06 01 12 01 07 01 13 01 07 01 13 01 07 01 19 02 0c 01 0c 01 0c 02 | <............................... |
| 3140 | 12 01 10 01 1b 01 25 02 09 02 10 02 12 01 18 01 07 00 06 01 11 02 10 01 0e 02 0a 01 10 01 17 01 | ......%......................... |
| 3160 | 28 0d 00 00 00 74 04 00 00 00 69 31 38 6e 52 00 00 00 00 52 74 00 00 00 52 1d 00 00 00 52 8b 00 | (....t....i18nR....Rt...R....R.. |
| 3180 | 00 00 52 85 00 00 00 74 09 00 00 00 45 78 63 65 70 74 69 6f 6e 52 01 00 00 00 52 0b 00 00 00 52 | ..R....t....ExceptionR....R....R |
| 31a0 | 18 00 00 00 74 06 00 00 00 6f 62 6a 65 63 74 52 19 00 00 00 52 97 00 00 00 28 00 00 00 00 28 00 | ....t....objectR....R....(....(. |
| 31c0 | 00 00 00 28 00 00 00 00 73 6a 00 00 00 2f 68 6f 6d 65 2f 6e 69 73 68 61 6e 74 68 2f 44 65 73 6b | ...(....sj.../home/nishanth/Desk |
| 31e0 | 74 6f 70 2f 70 79 74 2d 62 6c 64 2f 70 79 74 61 73 6b 2f 65 67 67 73 2f 6d 65 72 63 75 72 69 61 | top/pyt-bld/pytask/eggs/mercuria |
| 3200 | 6c 2d 31 2e 37 2e 33 2d 70 79 32 2e 36 2d 6c 69 6e 75 78 2d 78 38 36 5f 36 34 2e 65 67 67 2f 6d | l-1.7.3-py2.6-linux-x86_64.egg/m |
| 3220 | 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 00 3c 6d 6f 64 | ercurial/simplemerge.pyt....<mod |
| 3240 | 75 6c 65 3e 14 00 00 00 73 10 00 00 00 10 01 18 01 18 02 16 03 09 16 09 0b 16 ff 00 58 | ule>....s...................X |
 |
index : pytask/.git | |
| A web application for managing task based workflows. |
| summaryrefslogtreecommitdiff |
blob: 367afbd2382813c030c76a764532e91f8c184cf3 (plain)