/ Linux Cubed Series 2: Applications / Linux Cubed Series 2 - Applications.iso / editors / emacs / xemacs / xemacs-1.006 / xemacs-1 / lib / xemacs-19.13 / lisp / ediff / ediff-hook.elc

< prev

next >

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 63 74 68 6f 6d 70 40 |piled by| cthomp@|
|00000020| 77 69 6c 6c 6f 77 2e 63 | 73 2e 75 69 75 63 2e 65 |willow.c|s.uiuc.e|
|00000030| 64 75 20 6f 6e 20 54 75 | 65 20 41 75 67 20 32 39 |du on Tu|e Aug 29|
|00000040| 20 31 34 3a 33 37 3a 33 | 33 20 31 39 39 35 0a 3b | 14:37:3|3 1995.;|
|00000050| 3b 3b 20 66 72 6f 6d 20 | 66 69 6c 65 20 2f 65 78 |;; from |file /ex|
|00000060| 70 6f 72 74 2f 77 69 6c | 6c 6f 77 33 2f 78 65 6d |port/wil|low3/xem|
|00000070| 61 63 73 2d 31 39 2e 31 | 33 2d 72 65 6c 65 61 73 |acs-19.1|3-releas|
|00000080| 65 2f 65 64 69 74 6f 72 | 2f 6c 69 73 70 2f 65 64 |e/editor|/lisp/ed|
|00000090| 69 66 66 2f 65 64 69 66 | 66 2d 68 6f 6f 6b 2e 65 |iff/edif|f-hook.e|
|000000a0| 6c 0a 3b 3b 3b 20 65 6d | 61 63 73 20 76 65 72 73 |l.;;; em|acs vers|
|000000b0| 69 6f 6e 20 31 39 2e 31 | 33 20 58 45 6d 61 63 73 |ion 19.1|3 XEmacs|
|000000c0| 20 4c 75 63 69 64 2e 0a | 3b 3b 3b 20 62 79 74 65 | Lucid..|;;; byte|
|000000d0| 63 6f 6d 70 20 76 65 72 | 73 69 6f 6e 20 32 2e 32 |comp ver|sion 2.2|
|000000e0| 35 3b 20 31 2d 53 65 70 | 2d 39 34 2e 0a 3b 3b 3b |5; 1-Sep|-94..;;;|
|000000f0| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000100| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000110| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000120| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000130| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 38 2e 0a |st in Em|acs 18..|
|00000140| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000150| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000160| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000170| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|00000180| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|00000190| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. |    (str|
|000001a0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001b0| 76 65 72 73 69 6f 6e 20 | 22 31 39 22 29 29 29 0a |version |"19"))).|
|000001c0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 54 68 69 73 |    (err|or "This|
|000001d0| 20 66 69 6c 65 20 77 61 | 73 20 63 6f 6d 70 69 6c | file wa|s compil|
|000001e0| 65 64 20 66 6f 72 20 45 | 6d 61 63 73 20 31 39 2e |ed for E|macs 19.|
|000001f0| 22 29 29 0a 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |"))..(by|te-code |
|00000200| 22 c0 c1 4d 88 c2 c3 0c | 5c 22 ab a8 c5 c6 21 ac |"..M....|\"....!.|
|00000210| 83 c7 16 06 c5 c8 21 ac | 83 c9 16 08 c5 ca 21 ac |......!.|......!.|
|00000220| 83 cb 16 5c 6e cc cd c0 | 5c 22 88 0e 0e 84 58 01 |...\n...|\"....X.|
|00000230| c0 20 88 82 58 01 cf d0 | 21 83 58 01 c5 d1 21 ac |. ..X...|!.X...!.|
|00000240| 84 d2 20 16 11 d1 89 4a | 4d 88 c5 d3 21 ac 84 d2 |.. ....J|M...!...|
|00000250| 20 16 13 d3 89 4a 4d 88 | c5 d4 21 ac 84 d2 20 16 | ....JM.|..!... .|
|00000260| 14 d4 89 4a 4d 88 d5 0e | 14 d6 d7 23 88 d5 0e 14 |...JM...|...#....|
|00000270| d8 d9 23 88 d5 0e 14 da | db 23 88 d5 0e 14 dc dd |..#.....|.#......|
|00000280| 23 88 d5 0e 14 de df 23 | 88 d5 0e 14 e0 e1 23 88 |#......#|......#.|
|00000290| d5 0e 14 e2 e3 23 88 d5 | 0e 14 e4 e5 23 88 d5 0e |.....#..|....#...|
|000002a0| 14 e6 e7 23 88 d5 0e 14 | e8 e9 23 88 d5 0e 14 ea |...#....|..#.....|
|000002b0| eb 23 88 d5 0e 14 ec ed | 23 88 d5 0e 14 ee ef 23 |.#......|#......#|
|000002c0| 88 d5 0e 14 f0 f1 23 88 | d5 0e 14 f2 f3 23 88 d5 |......#.|.....#..|
|000002d0| 0e 14 f4 f5 23 88 d5 0e | 13 f6 f7 23 88 d5 0e 13 |....#...|...#....|
|000002e0| f8 f9 23 88 d5 0e 13 fa | fb 23 88 d5 0e 13 fc fd |..#.....|.#......|
|000002f0| 23 88 d5 0e 13 fe ff 23 | 88 d5 0e 13 81 40 00 81 |#......#|.....@..|
|00000300| 41 00 23 88 d5 0e 13 81 | 42 00 81 43 00 23 88 d5 |A.#.....|B..C.#..|
|00000310| 0e 13 81 44 00 81 45 00 | 23 88 d5 0e 13 81 46 00 |...D..E.|#.....F.|
|00000320| 81 47 00 23 88 d5 0e 13 | 81 48 00 81 49 00 23 88 |.G.#....|.H..I.#.|
|00000330| d5 0e 13 81 4a 00 81 4b | 00 23 88 d5 0e 13 81 4c |....J..K|.#.....L|
|00000340| 00 81 4d 00 23 88 d5 0e | 11 81 4e 00 81 4f 00 23 |..M.#...|..N..O.#|
|00000350| 88 d5 0e 11 81 50 00 81 | 51 00 23 88 0e 0e 84 be |.....P..|Q.#.....|
|00000360| 03 81 52 00 81 53 00 81 | 54 00 81 55 00 81 56 00 |..R..S..|T..U..V.|
|00000370| 24 88 81 52 00 81 57 00 | 81 54 00 81 55 00 81 56 |$..R..W.|.T..U..V|
|00000380| 00 24 88 81 52 00 81 58 | 00 81 54 00 81 59 00 81 |.$..R..X|..T..Y..|
|00000390| 56 00 24 88 81 52 00 81 | 5a 00 81 54 00 81 5b 00 |V.$..R..|Z..T..[.|
|000003a0| 81 56 00 24 88 81 52 00 | 81 5c 5c 00 81 54 00 81 |.V.$..R.|.\\..T..|
|000003b0| 5b 00 81 56 00 24 88 81 | 52 00 81 5d 00 81 54 00 |[..V.$..|R..]..T.|
|000003c0| 81 5e 00 81 56 00 24 88 | 81 52 00 81 5f 00 81 54 |.^..V.$.|.R.._..T|
|000003d0| 00 81 60 00 81 56 00 24 | 88 81 52 00 81 61 00 81 |..`..V.$|..R..a..|
|000003e0| 54 00 81 62 00 81 56 00 | 24 88 81 52 00 81 63 00 |T..b..V.|$..R..c.|
|000003f0| 81 54 00 81 64 00 81 56 | 00 24 88 81 52 00 81 65 |.T..d..V|.$..R..e|
|00000400| 00 81 54 00 81 66 00 81 | 56 00 24 88 81 52 00 81 |..T..f..|V.$..R..|
|00000410| 67 00 81 54 00 81 68 00 | 81 56 00 24 88 81 52 00 |g..T..h.|.V.$..R.|
|00000420| 81 69 00 81 54 00 81 6a | 00 81 56 00 24 88 81 52 |.i..T..j|..V.$..R|
|00000430| 00 81 6b 00 81 54 00 81 | 6a 00 81 56 00 24 88 81 |..k..T..|j..V.$..|
|00000440| 52 00 81 6c 00 81 54 00 | 81 6d 00 23 88 81 52 00 |R..l..T.|.m.#..R.|
|00000450| 81 6e 00 81 54 00 81 6d | 00 81 56 00 24 88 81 52 |.n..T..m|..V.$..R|
|00000460| 00 81 6f 00 81 54 00 81 | 70 00 81 56 00 24 88 81 |..o..T..|p..V.$..|
|00000470| 52 00 81 71 00 81 54 00 | 81 70 00 81 56 00 24 88 |R..q..T.|.p..V.$.|
|00000480| 81 52 00 81 72 00 81 54 | 00 81 73 00 81 56 00 24 |.R..r..T|..s..V.$|
|00000490| 88 81 52 00 81 74 00 81 | 54 00 81 75 00 81 56 00 |..R..t..|T..u..V.|
|000004a0| 24 88 81 52 00 81 76 00 | 81 54 00 81 77 00 81 56 |$..R..v.|.T..w..V|
|000004b0| 00 24 88 81 52 00 81 78 | 00 81 54 00 81 79 00 81 |.$..R..x|..T..y..|
|000004c0| 56 00 24 88 81 52 00 81 | 7a 00 81 54 00 81 79 00 |V.$..R..|z..T..y.|
|000004d0| 81 56 00 24 88 81 52 00 | 81 7b 00 81 54 00 81 7c |.V.$..R.|.{..T..||
|000004e0| 00 81 56 00 24 88 81 52 | 00 81 7d 00 81 54 00 81 |..V.$..R|..}..T..|
|000004f0| 7c 00 81 56 00 24 88 81 | 52 00 81 7e 00 81 54 00 ||..V.$..|R..~..T.|
|00000500| 81 7f 00 81 56 00 24 88 | 81 52 00 81 80 00 81 54 |....V.$.|.R.....T|
|00000510| 00 81 7f 00 81 56 00 24 | 88 81 52 00 81 81 00 81 |.....V.$|..R.....|
|00000520| 54 00 81 82 00 81 56 00 | 24 88 81 52 00 81 83 00 |T.....V.|$..R....|
|00000530| 81 54 00 81 82 00 81 56 | 00 24 88 81 52 00 81 84 |.T.....V|.$..R...|
|00000540| 00 81 54 00 81 85 00 81 | 56 00 24 88 81 52 00 81 |..T.....|V.$..R..|
|00000550| 86 00 81 54 00 81 85 00 | 81 56 00 24 88 81 52 00 |...T....|.V.$..R.|
|00000560| 81 87 00 81 54 00 81 88 | 00 81 56 00 24 88 81 52 |....T...|..V.$..R|
|00000570| 00 81 89 00 81 54 00 81 | 88 00 81 56 00 24 88 81 |.....T..|...V.$..|
|00000580| 52 00 81 8a 00 81 54 00 | 81 8b 00 81 56 00 24 88 |R.....T.|....V.$.|
|00000590| 81 52 00 81 8c 00 81 54 | 00 81 8b 00 81 56 00 24 |.R.....T|.....V.$|
|000005a0| 88 81 52 00 81 8d 00 81 | 54 00 81 8e 00 81 56 00 |..R.....|T.....V.|
|000005b0| 24 88 81 52 00 81 8f 00 | 81 54 00 81 8e 00 81 56 |$..R....|.T.....V|
|000005c0| 00 24 88 81 90 00 81 91 | 00 21 87 22 20 5b 65 64 |.$......|.!." [ed|
|000005d0| 69 66 66 2d 78 65 6d 61 | 63 73 2d 69 6e 69 74 2d |iff-xema|cs-init-|
|000005e0| 6d 65 6e 75 73 20 23 5b | 6e 69 6c 20 22 c0 c1 21 |menus #[|nil "..!|
|000005f0| ad 93 c2 c3 0c c5 23 88 | c2 c6 0e 07 c5 23 88 c2 |......#.|.....#..|
|00000600| c8 0e 09 c5 23 87 22 20 | 5b 66 65 61 74 75 72 65 |....#." |[feature|
|00000610| 70 20 6d 65 6e 75 62 61 | 72 20 61 64 64 2d 73 75 |p menuba|r add-su|
|00000620| 62 6d 65 6e 75 20 28 22 | 54 6f 6f 6c 73 22 29 20 |bmenu ("|Tools") |
|00000630| 65 64 69 66 66 2d 6d 65 | 6e 75 20 22 4f 4f 2d 42 |ediff-me|nu "OO-B|
|00000640| 72 6f 77 73 65 72 2e 2e | 2e 22 20 28 22 54 6f 6f |rowser..|." ("Too|
|00000650| 6c 73 22 29 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |ls") edi|ff-merge|
|00000660| 2d 6d 65 6e 75 20 28 22 | 54 6f 6f 6c 73 22 29 20 |-menu ("|Tools") |
|00000670| 65 70 61 74 63 68 2d 6d | 65 6e 75 5d 20 34 5d 20 |epatch-m|enu] 4] |
|00000680| 73 74 72 69 6e 67 2d 6d | 61 74 63 68 20 22 58 45 |string-m|atch "XE|
|00000690| 6d 61 63 73 22 20 65 6d | 61 63 73 2d 76 65 72 73 |macs" em|acs-vers|
|000006a0| 69 6f 6e 20 62 6f 75 6e | 64 70 20 65 64 69 66 66 |ion boun|dp ediff|
|000006b0| 2d 6d 65 6e 75 20 28 22 | 43 6f 6d 70 61 72 65 22 |-menu ("|Compare"|
|000006c0| 20 5b 22 54 77 6f 20 46 | 69 6c 65 73 20 2e 2e 2e | ["Two F|iles ...|
|000006d0| 22 20 65 64 69 66 66 2d | 66 69 6c 65 73 20 74 5d |" ediff-|files t]|
|000006e0| 20 5b 22 54 77 6f 20 42 | 75 66 66 65 72 73 20 2e | ["Two B|uffers .|
|000006f0| 2e 2e 22 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |.." edif|f-buffer|
|00000700| 73 20 74 5d 20 5b 22 54 | 68 72 65 65 20 46 69 6c |s t] ["T|hree Fil|
|00000710| 65 73 20 2e 2e 2e 22 20 | 65 64 69 66 66 2d 66 69 |es ..." |ediff-fi|
|00000720| 6c 65 73 33 20 74 5d 20 | 5b 22 54 68 72 65 65 20 |les3 t] |["Three |
|00000730| 42 75 66 66 65 72 73 20 | 2e 2e 2e 22 20 65 64 69 |Buffers |..." edi|
|00000740| 66 66 2d 62 75 66 66 65 | 72 73 33 20 74 5d 20 22 |ff-buffe|rs3 t] "|
|00000750| 2d 2d 2d 22 20 5b 22 54 | 77 6f 20 44 69 72 65 63 |---" ["T|wo Direc|
|00000760| 74 6f 72 69 65 73 20 2e | 2e 2e 22 20 65 64 69 66 |tories .|.." edif|
|00000770| 66 2d 64 69 72 65 63 74 | 6f 72 69 65 73 20 74 5d |f-direct|ories t]|
|00000780| 20 5b 22 54 68 72 65 65 | 20 44 69 72 65 63 74 6f | ["Three| Directo|
|00000790| 72 69 65 73 20 2e 2e 2e | 22 20 65 64 69 66 66 2d |ries ...|" ediff-|
|000007a0| 64 69 72 65 63 74 6f 72 | 69 65 73 33 20 74 5d 20 |director|ies3 t] |
|000007b0| 22 2d 2d 2d 22 20 5b 22 | 46 69 6c 65 20 77 69 74 |"---" ["|File wit|
|000007c0| 68 20 52 65 76 69 73 69 | 6f 6e 20 2e 2e 2e 22 20 |h Revisi|on ..." |
|000007d0| 65 64 69 66 66 2d 72 65 | 76 69 73 69 6f 6e 20 74 |ediff-re|vision t|
|000007e0| 5d 20 5b 22 44 69 72 65 | 63 74 6f 72 79 20 52 65 |] ["Dire|ctory Re|
|000007f0| 76 69 73 69 6f 6e 73 20 | 2e 2e 2e 22 20 65 64 69 |visions |..." edi|
|00000800| 66 66 2d 64 69 72 65 63 | 74 6f 72 79 2d 72 65 76 |ff-direc|tory-rev|
|00000810| 69 73 69 6f 6e 73 20 74 | 5d 20 22 2d 2d 2d 22 20 |isions t|] "---" |
|00000820| 5b 22 57 69 6e 64 6f 77 | 73 20 57 6f 72 64 2d 62 |["Window|s Word-b|
|00000830| 79 2d 77 6f 72 64 20 2e | 2e 2e 22 20 65 64 69 66 |y-word .|.." edif|
|00000840| 66 2d 77 69 6e 64 6f 77 | 73 2d 77 6f 72 64 77 69 |f-window|s-wordwi|
|00000850| 73 65 20 74 5d 20 5b 22 | 57 69 6e 64 6f 77 73 20 |se t] ["|Windows |
|00000860| 4c 69 6e 65 2d 62 79 2d | 6c 69 6e 65 20 2e 2e 2e |Line-by-|line ...|
|00000870| 22 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 73 2d |" ediff-|windows-|
|00000880| 6c 69 6e 65 77 69 73 65 | 20 74 5d 20 22 2d 2d 2d |linewise| t] "---|
|00000890| 22 20 5b 22 52 65 67 69 | 6f 6e 73 20 57 6f 72 64 |" ["Regi|ons Word|
|000008a0| 2d 62 79 2d 77 6f 72 64 | 20 2e 2e 2e 22 20 65 64 |-by-word| ..." ed|
|000008b0| 69 66 66 2d 72 65 67 69 | 6f 6e 73 2d 77 6f 72 64 |iff-regi|ons-word|
|000008c0| 77 69 73 65 20 74 5d 20 | 5b 22 52 65 67 69 6f 6e |wise t] |["Region|
|000008d0| 73 20 4c 69 6e 65 2d 62 | 79 2d 6c 69 6e 65 20 2e |s Line-b|y-line .|
|000008e0| 2e 2e 22 20 65 64 69 66 | 66 2d 72 65 67 69 6f 6e |.." edif|f-region|
|000008f0| 73 2d 6c 69 6e 65 77 69 | 73 65 20 74 5d 29 20 65 |s-linewi|se t]) e|
|00000900| 64 69 66 66 2d 6d 65 72 | 67 65 2d 6d 65 6e 75 20 |diff-mer|ge-menu |
|00000910| 28 22 4d 65 72 67 65 22 | 20 5b 22 46 69 6c 65 73 |("Merge"| ["Files|
|00000920| 20 2e 2e 2e 22 20 65 64 | 69 66 66 2d 6d 65 72 67 | ..." ed|iff-merg|
|00000930| 65 2d 66 69 6c 65 73 20 | 74 5d 20 5b 22 46 69 6c |e-files |t] ["Fil|
|00000940| 65 73 20 77 69 74 68 20 | 41 6e 63 65 73 74 6f 72 |es with |Ancestor|
|00000950| 20 2e 2e 2e 22 20 65 64 | 69 66 66 2d 6d 65 72 67 | ..." ed|iff-merg|
|00000960| 65 2d 66 69 6c 65 73 2d | 77 69 74 68 2d 61 6e 63 |e-files-|with-anc|
|00000970| 65 73 74 6f 72 20 74 5d | 20 5b 22 42 75 66 66 65 |estor t]| ["Buffe|
|00000980| 72 73 20 2e 2e 2e 22 20 | 65 64 69 66 66 2d 6d 65 |rs ..." |ediff-me|
|00000990| 72 67 65 2d 62 75 66 66 | 65 72 73 20 74 5d 20 5b |rge-buff|ers t] [|
|000009a0| 22 42 75 66 66 65 72 73 | 20 77 69 74 68 20 41 6e |"Buffers| with An|
|000009b0| 63 65 73 74 6f 72 20 2e | 2e 2e 22 20 65 64 69 66 |cestor .|.." edif|
|000009c0| 66 2d 6d 65 72 67 65 2d | 62 75 66 66 65 72 73 2d |f-merge-|buffers-|
|000009d0| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 20 74 5d |with-anc|estor t]|
|000009e0| 20 22 2d 2d 2d 22 20 5b | 22 44 69 72 65 63 74 6f | "---" [|"Directo|
|000009f0| 72 69 65 73 20 2e 2e 2e | 22 20 65 64 69 66 66 2d |ries ...|" ediff-|
|00000a00| 6d 65 72 67 65 2d 64 69 | 72 65 63 74 6f 72 69 65 |merge-di|rectorie|
|00000a10| 73 20 74 5d 20 5b 22 44 | 69 72 65 63 74 6f 72 69 |s t] ["D|irectori|
|00000a20| 65 73 20 77 69 74 68 20 | 41 6e 63 65 73 74 6f 72 |es with |Ancestor|
|00000a30| 20 2e 2e 2e 22 20 65 64 | 69 66 66 2d 6d 65 72 67 | ..." ed|iff-merg|
|00000a40| 65 2d 64 69 72 65 63 74 | 6f 72 69 65 73 2d 77 69 |e-direct|ories-wi|
|00000a50| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 74 5d 20 22 |th-ances|tor t] "|
|00000a60| 2d 2d 2d 22 20 5b 22 52 | 65 76 69 73 69 6f 6e 73 |---" ["R|evisions|
|00000a70| 20 2e 2e 2e 22 20 65 64 | 69 66 66 2d 6d 65 72 67 | ..." ed|iff-merg|
|00000a80| 65 2d 72 65 76 69 73 69 | 6f 6e 73 20 74 5d 20 5b |e-revisi|ons t] [|
|00000a90| 22 52 65 76 69 73 69 6f | 6e 73 20 77 69 74 68 20 |"Revisio|ns with |
|00000aa0| 41 6e 63 65 73 74 6f 72 | 20 2e 2e 2e 22 20 65 64 |Ancestor| ..." ed|
|00000ab0| 69 66 66 2d 6d 65 72 67 | 65 2d 72 65 76 69 73 69 |iff-merg|e-revisi|
|00000ac0| 6f 6e 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ons-with|-ancesto|
|00000ad0| 72 20 74 5d 20 5b 22 44 | 69 72 65 63 74 6f 72 79 |r t] ["D|irectory|
|00000ae0| 20 52 65 76 69 73 69 6f | 6e 73 20 2e 2e 2e 22 20 | Revisio|ns ..." |
|00000af0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 64 69 72 65 |ediff-me|rge-dire|
|00000b00| 63 74 6f 72 79 2d 72 65 | 76 69 73 69 6f 6e 73 20 |ctory-re|visions |
|00000b10| 74 5d 20 5b 22 44 69 72 | 65 63 74 6f 72 79 20 52 |t] ["Dir|ectory R|
|00000b20| 65 76 69 73 69 6f 6e 73 | 20 77 69 74 68 20 41 6e |evisions| with An|
|00000b30| 63 65 73 74 6f 72 20 2e | 2e 2e 22 20 65 64 69 66 |cestor .|.." edif|
|00000b40| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00000b50| 79 2d 72 65 76 69 73 69 | 6f 6e 73 2d 77 69 74 68 |y-revisi|ons-with|
|00000b60| 2d 61 6e 63 65 73 74 6f | 72 20 74 5d 29 20 65 70 |-ancesto|r t]) ep|
|00000b70| 61 74 63 68 2d 6d 65 6e | 75 20 28 22 41 70 70 6c |atch-men|u ("Appl|
|00000b80| 79 20 50 61 74 63 68 22 | 20 5b 22 54 6f 20 61 20 |y Patch"| ["To a |
|00000b90| 66 69 6c 65 20 2e 2e 2e | 22 20 65 64 69 66 66 2d |file ...|" ediff-|
|00000ba0| 70 61 74 63 68 2d 66 69 | 6c 65 20 74 5d 20 5b 22 |patch-fi|le t] ["|
|00000bb0| 54 6f 20 61 20 62 75 66 | 66 65 72 20 2e 2e 2e 22 |To a buf|fer ..."|
|00000bc0| 20 65 64 69 66 66 2d 70 | 61 74 63 68 2d 62 75 66 | ediff-p|atch-buf|
|00000bd0| 66 65 72 20 74 5d 29 20 | 61 64 64 2d 68 6f 6f 6b |fer t]) |add-hook|
|00000be0| 20 62 65 66 6f 72 65 2d | 69 6e 69 74 2d 68 6f 6f | before-|init-hoo|
|00000bf0| 6b 20 70 75 72 69 66 79 | 2d 66 6c 61 67 20 66 65 |k purify|-flag fe|
|00000c00| 61 74 75 72 65 70 20 6d | 65 6e 75 2d 62 61 72 20 |aturep m|enu-bar |
|00000c10| 6d 65 6e 75 2d 62 61 72 | 2d 65 70 61 74 63 68 2d |menu-bar|-epatch-|
|00000c20| 6d 65 6e 75 20 6d 61 6b | 65 2d 73 70 61 72 73 65 |menu mak|e-sparse|
|00000c30| 2d 6b 65 79 6d 61 70 20 | 6d 65 6e 75 2d 62 61 72 |-keymap |menu-bar|
|00000c40| 2d 65 64 69 66 66 2d 6d | 65 72 67 65 2d 6d 65 6e |-ediff-m|erge-men|
|00000c50| 75 20 6d 65 6e 75 2d 62 | 61 72 2d 65 64 69 66 66 |u menu-b|ar-ediff|
|00000c60| 2d 6d 65 6e 75 20 64 65 | 66 69 6e 65 2d 6b 65 79 |-menu de|fine-key|
|00000c70| 20 5b 65 64 69 66 66 2d | 64 69 72 2d 72 65 76 69 | [ediff-|dir-revi|
|00000c80| 73 69 6f 6e 5d 20 28 22 | 44 69 72 65 63 74 6f 72 |sion] ("|Director|
|00000c90| 79 20 52 65 76 69 73 69 | 6f 6e 73 20 2e 2e 2e 22 |y Revisi|ons ..."|
|00000ca0| 20 2e 20 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f | . ediff|-directo|
|00000cb0| 72 79 2d 72 65 76 69 73 | 69 6f 6e 73 29 20 5b 65 |ry-revis|ions) [e|
|00000cc0| 64 69 66 66 2d 72 65 76 | 69 73 69 6f 6e 5d 20 28 |diff-rev|ision] (|
|00000cd0| 22 46 69 6c 65 20 77 69 | 74 68 20 52 65 76 69 73 |"File wi|th Revis|
|00000ce0| 69 6f 6e 20 2e 2e 2e 22 | 20 2e 20 65 64 69 66 66 |ion ..."| . ediff|
|00000cf0| 2d 72 65 76 69 73 69 6f | 6e 29 20 5b 73 65 70 61 |-revisio|n) [sepa|
|00000d00| 72 61 74 6f 72 2d 65 64 | 69 66 66 2d 64 69 72 65 |rator-ed|iff-dire|
|00000d10| 63 74 6f 72 69 65 73 5d | 20 28 22 2d 2d 22 29 20 |ctories]| ("--") |
|00000d20| 5b 65 64 69 66 66 2d 64 | 69 72 65 63 74 6f 72 69 |[ediff-d|irectori|
|00000d30| 65 73 33 5d 20 28 22 54 | 68 72 65 65 20 44 69 72 |es3] ("T|hree Dir|
|00000d40| 65 63 74 6f 72 69 65 73 | 20 2e 2e 2e 22 20 2e 20 |ectories| ..." . |
|00000d50| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 69 65 |ediff-di|rectorie|
|00000d60| 73 33 29 20 5b 65 64 69 | 66 66 2d 64 69 72 65 63 |s3) [edi|ff-direc|
|00000d70| 74 6f 72 69 65 73 5d 20 | 28 22 54 77 6f 20 44 69 |tories] |("Two Di|
|00000d80| 72 65 63 74 6f 72 69 65 | 73 20 2e 2e 2e 22 20 2e |rectorie|s ..." .|
|00000d90| 20 65 64 69 66 66 2d 64 | 69 72 65 63 74 6f 72 69 | ediff-d|irectori|
|00000da0| 65 73 29 20 5b 73 65 70 | 61 72 61 74 6f 72 2d 65 |es) [sep|arator-e|
|00000db0| 64 69 66 66 2d 66 69 6c | 65 73 5d 20 28 22 2d 2d |diff-fil|es] ("--|
|00000dc0| 22 29 20 5b 65 64 69 66 | 66 2d 62 75 66 66 65 72 |") [edif|f-buffer|
|00000dd0| 73 33 5d 20 28 22 54 68 | 72 65 65 20 42 75 66 66 |s3] ("Th|ree Buff|
|00000de0| 65 72 73 20 2e 2e 2e 22 | 20 2e 20 65 64 69 66 66 |ers ..."| . ediff|
|00000df0| 2d 62 75 66 66 65 72 73 | 33 29 20 5b 65 64 69 66 |-buffers|3) [edif|
|00000e00| 66 2d 66 69 6c 65 73 33 | 5d 20 28 22 54 68 72 65 |f-files3|] ("Thre|
|00000e10| 65 20 46 69 6c 65 73 20 | 2e 2e 2e 22 20 2e 20 65 |e Files |..." . e|
|00000e20| 64 69 66 66 2d 66 69 6c | 65 73 33 29 20 5b 65 64 |diff-fil|es3) [ed|
|00000e30| 69 66 66 2d 62 75 66 66 | 65 72 73 5d 20 28 22 54 |iff-buff|ers] ("T|
|00000e40| 77 6f 20 42 75 66 66 65 | 72 73 20 2e 2e 2e 22 20 |wo Buffe|rs ..." |
|00000e50| 2e 20 65 64 69 66 66 2d | 62 75 66 66 65 72 73 29 |. ediff-|buffers)|
|00000e60| 20 5b 65 64 69 66 66 2d | 66 69 6c 65 73 5d 20 28 | [ediff-|files] (|
|00000e70| 22 54 77 6f 20 46 69 6c | 65 73 20 2e 2e 2e 22 20 |"Two Fil|es ..." |
|00000e80| 2e 20 65 64 69 66 66 2d | 66 69 6c 65 73 29 20 5b |. ediff-|files) [|
|00000e90| 73 65 70 61 72 61 74 6f | 72 2d 65 64 69 66 66 2d |separato|r-ediff-|
|00000ea0| 72 65 67 69 6f 6e 73 5d | 20 28 22 2d 2d 22 29 20 |regions]| ("--") |
|00000eb0| 5b 65 64 69 66 66 2d 72 | 65 67 69 6f 6e 73 2d 6c |[ediff-r|egions-l|
|00000ec0| 69 6e 65 77 69 73 65 5d | 20 28 22 52 65 67 69 6f |inewise]| ("Regio|
|00000ed0| 6e 73 20 4c 69 6e 65 2d | 62 79 2d 6c 69 6e 65 20 |ns Line-|by-line |
|00000ee0| 2e 2e 2e 22 20 2e 20 65 | 64 69 66 66 2d 72 65 67 |..." . e|diff-reg|
|00000ef0| 69 6f 6e 73 2d 6c 69 6e | 65 77 69 73 65 29 20 5b |ions-lin|ewise) [|
|00000f00| 65 64 69 66 66 2d 72 65 | 67 69 6f 6e 73 2d 77 6f |ediff-re|gions-wo|
|00000f10| 72 64 77 69 73 65 5d 20 | 28 22 52 65 67 69 6f 6e |rdwise] |("Region|
|00000f20| 73 20 57 6f 72 64 2d 62 | 79 2d 77 6f 72 64 20 2e |s Word-b|y-word .|
|00000f30| 2e 2e 22 20 2e 20 65 64 | 69 66 66 2d 72 65 67 69 |.." . ed|iff-regi|
|00000f40| 6f 6e 73 2d 77 6f 72 64 | 77 69 73 65 29 20 5b 73 |ons-word|wise) [s|
|00000f50| 65 70 61 72 61 74 6f 72 | 2d 65 64 69 66 66 2d 77 |eparator|-ediff-w|
|00000f60| 69 6e 64 6f 77 73 5d 20 | 28 22 2d 2d 22 29 20 5b |indows] |("--") [|
|00000f70| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 73 2d 6c 69 |ediff-wi|ndows-li|
|00000f80| 6e 65 77 69 73 65 5d 20 | 28 22 57 69 6e 64 6f 77 |newise] |("Window|
|00000f90| 73 20 4c 69 6e 65 2d 62 | 79 2d 6c 69 6e 65 20 2e |s Line-b|y-line .|
|00000fa0| 2e 2e 22 20 2e 20 65 64 | 69 66 66 2d 77 69 6e 64 |.." . ed|iff-wind|
|00000fb0| 6f 77 73 2d 6c 69 6e 65 | 77 69 73 65 29 20 5b 65 |ows-line|wise) [e|
|00000fc0| 64 69 66 66 2d 77 69 6e | 64 6f 77 73 2d 77 6f 72 |diff-win|dows-wor|
|00000fd0| 64 77 69 73 65 5d 20 28 | 22 57 69 6e 64 6f 77 73 |dwise] (|"Windows|
|00000fe0| 20 57 6f 72 64 2d 62 79 | 2d 77 6f 72 64 20 2e 2e | Word-by|-word ..|
|00000ff0| 2e 22 20 2e 20 65 64 69 | 66 66 2d 77 69 6e 64 6f |." . edi|ff-windo|
|00001000| 77 73 2d 77 6f 72 64 77 | 69 73 65 29 20 5b 65 64 |ws-wordw|ise) [ed|
|00001010| 69 66 66 2d 6d 65 72 67 | 65 2d 64 69 72 2d 72 65 |iff-merg|e-dir-re|
|00001020| 76 69 73 69 6f 6e 73 2d | 77 69 74 68 2d 61 6e 63 |visions-|with-anc|
|00001030| 65 73 74 6f 72 5d 20 28 | 22 44 69 72 65 63 74 6f |estor] (|"Directo|
|00001040| 72 79 20 52 65 76 69 73 | 69 6f 6e 73 20 77 69 74 |ry Revis|ions wit|
|00001050| 68 20 41 6e 63 65 73 74 | 6f 72 20 2e 2e 2e 22 20 |h Ancest|or ..." |
|00001060| 2e 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |. ediff-|merge-di|
|00001070| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|00001080| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 29 |s-with-a|ncestor)|
|00001090| 20 5b 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 | [ediff-|merge-di|
|000010a0| 72 2d 72 65 76 69 73 69 | 6f 6e 73 5d 20 28 22 44 |r-revisi|ons] ("D|
|000010b0| 69 72 65 63 74 6f 72 79 | 20 52 65 76 69 73 69 6f |irectory| Revisio|
|000010c0| 6e 73 20 2e 2e 2e 22 20 | 2e 20 65 64 69 66 66 2d |ns ..." |. ediff-|
|000010d0| 6d 65 72 67 65 2d 64 69 | 72 65 63 74 6f 72 79 2d |merge-di|rectory-|
|000010e0| 72 65 76 69 73 69 6f 6e | 73 29 20 5b 65 64 69 66 |revision|s) [edif|
|000010f0| 66 2d 6d 65 72 67 65 2d | 72 65 76 69 73 69 6f 6e |f-merge-|revision|
|00001100| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 5d |s-with-a|ncestor]|
|00001110| 20 28 22 52 65 76 69 73 | 69 6f 6e 73 20 77 69 74 | ("Revis|ions wit|
|00001120| 68 20 41 6e 63 65 73 74 | 6f 72 20 2e 2e 2e 22 20 |h Ancest|or ..." |
|00001130| 2e 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 72 65 |. ediff-|merge-re|
|00001140| 76 69 73 69 6f 6e 73 2d | 77 69 74 68 2d 61 6e 63 |visions-|with-anc|
|00001150| 65 73 74 6f 72 29 20 5b | 65 64 69 66 66 2d 6d 65 |estor) [|ediff-me|
|00001160| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 5d 20 28 |rge-revi|sions] (|
|00001170| 22 52 65 76 69 73 69 6f | 6e 73 20 2e 2e 2e 22 20 |"Revisio|ns ..." |
|00001180| 2e 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 72 65 |. ediff-|merge-re|
|00001190| 76 69 73 69 6f 6e 73 29 | 20 5b 73 65 70 61 72 61 |visions)| [separa|
|000011a0| 74 6f 72 2d 65 64 69 66 | 66 2d 6d 65 72 67 65 5d |tor-edif|f-merge]|
|000011b0| 20 28 22 2d 2d 22 29 20 | 5b 65 64 69 66 66 2d 6d | ("--") |[ediff-m|
|000011c0| 65 72 67 65 2d 64 69 72 | 65 63 74 6f 72 69 65 73 |erge-dir|ectories|
|000011d0| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 5d 20 |-with-an|cestor] |
|000011e0| 28 22 44 69 72 65 63 74 | 6f 72 69 65 73 20 77 69 |("Direct|ories wi|
|000011f0| 74 68 20 41 6e 63 65 73 | 74 6f 72 20 2e 2e 2e 22 |th Ances|tor ..."|
|00001200| 20 2e 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 64 | . ediff|-merge-d|
|00001210| 69 72 65 63 74 6f 72 69 | 65 73 2d 77 69 74 68 2d |irectori|es-with-|
|00001220| 61 6e 63 65 73 74 6f 72 | 29 20 5b 65 64 69 66 66 |ancestor|) [ediff|
|00001230| 2d 6d 65 72 67 65 2d 64 | 69 72 65 63 74 6f 72 69 |-merge-d|irectori|
|00001240| 65 73 5d 20 28 22 44 69 | 72 65 63 74 6f 72 69 65 |es] ("Di|rectorie|
|00001250| 73 20 2e 2e 2e 22 20 2e | 20 65 64 69 66 66 2d 6d |s ..." .| ediff-m|
|00001260| 65 72 67 65 2d 64 69 72 | 65 63 74 6f 72 69 65 73 |erge-dir|ectories|
|00001270| 29 20 5b 73 65 70 61 72 | 61 74 6f 72 2d 65 64 69 |) [separ|ator-edi|
|00001280| 66 66 2d 6d 65 72 67 65 | 2d 64 69 72 73 5d 20 28 |ff-merge|-dirs] (|
|00001290| 22 2d 2d 22 29 20 5b 65 | 64 69 66 66 2d 6d 65 72 |"--") [e|diff-mer|
|000012a0| 67 65 2d 62 75 66 66 65 | 72 73 2d 77 69 74 68 2d |ge-buffe|rs-with-|
|000012b0| 61 6e 63 65 73 74 6f 72 | 5d 20 28 22 42 75 66 66 |ancestor|] ("Buff|
|000012c0| 65 72 73 20 77 69 74 68 | 20 41 6e 63 65 73 74 6f |ers with| Ancesto|
|000012d0| 72 20 2e 2e 2e 22 20 2e | 20 65 64 69 66 66 2d 6d |r ..." .| ediff-m|
|000012e0| 65 72 67 65 2d 62 75 66 | 66 65 72 73 2d 77 69 74 |erge-buf|fers-wit|
|000012f0| 68 2d 61 6e 63 65 73 74 | 6f 72 29 20 5b 65 64 69 |h-ancest|or) [edi|
|00001300| 66 66 2d 6d 65 72 67 65 | 2d 62 75 66 66 65 72 73 |ff-merge|-buffers|
|00001310| 5d 20 28 22 42 75 66 66 | 65 72 73 20 2e 2e 2e 22 |] ("Buff|ers ..."|
|00001320| 20 2e 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 62 | . ediff|-merge-b|
|00001330| 75 66 66 65 72 73 29 20 | 5b 65 64 69 66 66 2d 6d |uffers) |[ediff-m|
|00001340| 65 72 67 65 2d 66 69 6c | 65 73 2d 77 69 74 68 2d |erge-fil|es-with-|
|00001350| 61 6e 63 65 73 74 6f 72 | 5d 20 28 22 46 69 6c 65 |ancestor|] ("File|
|00001360| 73 20 77 69 74 68 20 41 | 6e 63 65 73 74 6f 72 20 |s with A|ncestor |
|00001370| 2e 2e 2e 22 20 2e 20 65 | 64 69 66 66 2d 6d 65 72 |..." . e|diff-mer|
|00001380| 67 65 2d 66 69 6c 65 73 | 2d 77 69 74 68 2d 61 6e |ge-files|-with-an|
|00001390| 63 65 73 74 6f 72 29 20 | 5b 65 64 69 66 66 2d 6d |cestor) |[ediff-m|
|000013a0| 65 72 67 65 2d 66 69 6c | 65 73 5d 20 28 22 46 69 |erge-fil|es] ("Fi|
|000013b0| 6c 65 73 20 2e 2e 2e 22 | 20 2e 20 65 64 69 66 66 |les ..."| . ediff|
|000013c0| 2d 6d 65 72 67 65 2d 66 | 69 6c 65 73 29 20 5b 65 |-merge-f|iles) [e|
|000013d0| 64 69 66 66 2d 70 61 74 | 63 68 2d 62 75 66 66 65 |diff-pat|ch-buffe|
|000013e0| 72 5d 20 28 22 54 6f 20 | 61 20 42 75 66 66 65 72 |r] ("To |a Buffer|
|000013f0| 20 2e 2e 2e 22 20 2e 20 | 65 64 69 66 66 2d 70 61 | ..." . |ediff-pa|
|00001400| 74 63 68 2d 62 75 66 66 | 65 72 29 20 5b 65 64 69 |tch-buff|er) [edi|
|00001410| 66 66 2d 70 61 74 63 68 | 2d 66 69 6c 65 5d 20 28 |ff-patch|-file] (|
|00001420| 22 54 6f 20 61 20 46 69 | 6c 65 20 2e 2e 2e 22 20 |"To a Fi|le ..." |
|00001430| 2e 20 65 64 69 66 66 2d | 70 61 74 63 68 2d 66 69 |. ediff-|patch-fi|
|00001440| 6c 65 29 20 61 75 74 6f | 6c 6f 61 64 20 65 64 69 |le) auto|load edi|
|00001450| 66 66 20 22 65 64 69 66 | 66 22 20 22 43 6f 6d 70 |ff "edif|f" "Comp|
|00001460| 61 72 65 20 74 77 6f 20 | 66 69 6c 65 73 22 20 74 |are two |files" t|
|00001470| 20 65 64 69 66 66 2d 66 | 69 6c 65 73 20 65 64 69 | ediff-f|iles edi|
|00001480| 66 66 2d 62 75 66 66 65 | 72 73 20 22 43 6f 6d 70 |ff-buffe|rs "Comp|
|00001490| 61 72 65 20 74 77 6f 20 | 62 75 66 65 72 73 22 20 |are two |bufers" |
|000014a0| 65 64 69 66 66 33 20 22 | 43 6f 6d 70 61 72 65 20 |ediff3 "|Compare |
|000014b0| 74 68 72 65 65 20 66 69 | 6c 65 73 22 20 65 64 69 |three fi|les" edi|
|000014c0| 66 66 2d 66 69 6c 65 73 | 33 20 65 64 69 66 66 2d |ff-files|3 ediff-|
|000014d0| 62 75 66 66 65 72 73 33 | 20 22 43 6f 6d 70 61 72 |buffers3| "Compar|
|000014e0| 65 20 74 68 72 65 65 20 | 62 75 66 65 72 73 22 20 |e three |bufers" |
|000014f0| 65 64 69 66 66 2d 72 65 | 76 69 73 69 6f 6e 20 22 |ediff-re|vision "|
|00001500| 43 6f 6d 70 61 72 65 20 | 76 65 72 73 69 6f 6e 73 |Compare |versions|
|00001510| 20 6f 66 20 61 20 66 69 | 6c 65 22 20 65 64 69 66 | of a fi|le" edif|
|00001520| 66 2d 77 69 6e 64 6f 77 | 73 2d 77 6f 72 64 77 69 |f-window|s-wordwi|
|00001530| 73 65 20 22 43 6f 6d 70 | 61 72 65 20 74 77 6f 20 |se "Comp|are two |
|00001540| 77 69 6e 64 6f 77 73 20 | 77 6f 72 64 2d 62 79 2d |windows |word-by-|
|00001550| 77 6f 72 64 22 20 65 64 | 69 66 66 2d 72 65 67 69 |word" ed|iff-regi|
|00001560| 6f 6e 73 2d 77 6f 72 64 | 77 69 73 65 20 22 43 6f |ons-word|wise "Co|
|00001570| 6d 70 61 72 65 20 74 77 | 6f 20 72 65 67 69 6f 6e |mpare tw|o region|
|00001580| 73 20 77 6f 72 64 2d 62 | 79 2d 77 6f 72 64 22 20 |s word-b|y-word" |
|00001590| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 73 2d 6c 69 |ediff-wi|ndows-li|
|000015a0| 6e 65 77 69 73 65 20 22 | 43 6f 6d 70 61 72 65 20 |newise "|Compare |
|000015b0| 74 77 6f 20 77 69 6e 64 | 6f 77 73 20 6c 69 6e 65 |two wind|ows line|
|000015c0| 2d 62 79 2d 6c 69 6e 65 | 22 20 65 64 69 66 66 2d |-by-line|" ediff-|
|000015d0| 72 65 67 69 6f 6e 73 2d | 6c 69 6e 65 77 69 73 65 |regions-|linewise|
|000015e0| 20 22 43 6f 6d 70 61 72 | 65 20 74 77 6f 20 72 65 | "Compar|e two re|
|000015f0| 67 69 6f 6e 73 20 6c 69 | 6e 65 2d 62 79 2d 6c 69 |gions li|ne-by-li|
|00001600| 6e 65 22 20 65 64 69 66 | 66 2d 70 61 74 63 68 2d |ne" edif|f-patch-|
|00001610| 66 69 6c 65 20 22 50 61 | 74 63 68 20 61 20 66 69 |file "Pa|tch a fi|
|00001620| 6c 65 22 20 65 70 61 74 | 63 68 20 65 64 69 66 66 |le" epat|ch ediff|
|00001630| 2d 70 61 74 63 68 2d 62 | 75 66 66 65 72 20 22 50 |-patch-b|uffer "P|
|00001640| 61 74 63 68 20 61 20 62 | 75 66 66 65 72 22 20 65 |atch a b|uffer" e|
|00001650| 70 61 74 63 68 2d 62 75 | 66 66 65 72 20 65 64 69 |patch-bu|ffer edi|
|00001660| 66 66 2d 6d 65 72 67 65 | 20 22 4d 65 72 67 65 20 |ff-merge| "Merge |
|00001670| 74 77 6f 20 66 69 6c 65 | 73 22 20 65 64 69 66 66 |two file|s" ediff|
|00001680| 2d 6d 65 72 67 65 2d 66 | 69 6c 65 73 20 65 64 69 |-merge-f|iles edi|
|00001690| 66 66 2d 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 77 |ff-merge|-files-w|
|000016a0| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 20 22 4d 65 |ith-ance|stor "Me|
|000016b0| 72 67 65 20 74 77 6f 20 | 66 69 6c 65 73 20 75 73 |rge two |files us|
|000016c0| 69 6e 67 20 61 20 74 68 | 69 72 64 20 66 69 6c 65 |ing a th|ird file|
|000016d0| 20 61 73 20 61 6e 20 61 | 6e 63 65 73 74 6f 72 22 | as an a|ncestor"|
|000016e0| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 62 75 66 | ediff-m|erge-buf|
|000016f0| 66 65 72 73 20 22 4d 65 | 72 67 65 20 74 77 6f 20 |fers "Me|rge two |
|00001700| 62 75 66 66 65 72 73 22 | 20 65 64 69 66 66 2d 6d |buffers"| ediff-m|
|00001710| 65 72 67 65 2d 62 75 66 | 66 65 72 73 2d 77 69 74 |erge-buf|fers-wit|
|00001720| 68 2d 61 6e 63 65 73 74 | 6f 72 20 22 4d 65 72 67 |h-ancest|or "Merg|
|00001730| 65 20 74 77 6f 20 62 75 | 66 66 65 72 73 20 75 73 |e two bu|ffers us|
|00001740| 69 6e 67 20 61 20 74 68 | 69 72 64 20 62 75 66 66 |ing a th|ird buff|
|00001750| 65 72 20 61 73 20 61 6e | 20 61 6e 63 65 73 74 6f |er as an| ancesto|
|00001760| 72 22 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 72 |r" ediff|-merge-r|
|00001770| 65 76 69 73 69 6f 6e 73 | 20 22 4d 65 72 67 65 20 |evisions| "Merge |
|00001780| 74 77 6f 20 76 65 72 73 | 69 6f 6e 73 20 6f 66 20 |two vers|ions of |
|00001790| 61 20 66 69 6c 65 22 20 | 65 64 69 66 66 2d 6d 65 |a file" |ediff-me|
|000017a0| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 2d 77 69 |rge-revi|sions-wi|
|000017b0| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 65 64 69 72 |th-ances|tor edir|
|000017c0| 73 20 22 43 6f 6d 70 61 | 72 65 20 66 69 6c 65 73 |s "Compa|re files|
|000017d0| 20 69 6e 20 74 77 6f 20 | 64 69 72 65 63 74 6f 72 | in two |director|
|000017e0| 69 65 73 22 20 65 64 69 | 66 66 2d 64 69 72 65 63 |ies" edi|ff-direc|
|000017f0| 74 6f 72 69 65 73 20 65 | 64 69 72 73 33 20 22 43 |tories e|dirs3 "C|
|00001800| 6f 6d 70 61 72 65 20 66 | 69 6c 65 73 20 69 6e 20 |ompare f|iles in |
|00001810| 74 68 72 65 65 20 64 69 | 72 65 63 74 6f 72 69 65 |three di|rectorie|
|00001820| 73 22 20 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f |s" ediff|-directo|
|00001830| 72 69 65 73 33 20 65 64 | 69 72 2d 72 65 76 69 73 |ries3 ed|ir-revis|
|00001840| 69 6f 6e 73 20 22 43 6f | 6d 70 61 72 65 20 74 77 |ions "Co|mpare tw|
|00001850| 6f 20 76 65 72 73 69 6f | 6e 73 20 6f 66 20 61 20 |o versio|ns of a |
|00001860| 66 69 6c 65 22 20 65 64 | 69 66 66 2d 64 69 72 65 |file" ed|iff-dire|
|00001870| 63 74 6f 72 79 2d 72 65 | 76 69 73 69 6f 6e 73 20 |ctory-re|visions |
|00001880| 65 64 69 72 73 2d 6d 65 | 72 67 65 20 22 4d 65 72 |edirs-me|rge "Mer|
|00001890| 67 65 20 66 69 6c 65 73 | 20 69 6e 20 74 77 6f 20 |ge files| in two |
|000018a0| 64 69 72 65 63 74 6f 72 | 69 65 73 22 20 65 64 69 |director|ies" edi|
|000018b0| 66 66 2d 6d 65 72 67 65 | 2d 64 69 72 65 63 74 6f |ff-merge|-directo|
|000018c0| 72 69 65 73 20 65 64 69 | 72 73 2d 6d 65 72 67 65 |ries edi|rs-merge|
|000018d0| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 20 22 |-with-an|cestor "|
|000018e0| 4d 65 72 67 65 20 66 69 | 6c 65 73 20 69 6e 20 74 |Merge fi|les in t|
|000018f0| 77 6f 20 64 69 72 65 63 | 74 6f 72 69 65 73 20 75 |wo direc|tories u|
|00001900| 73 69 6e 67 20 66 69 6c | 65 73 20 69 6e 20 61 20 |sing fil|es in a |
|00001910| 74 68 69 72 64 20 64 69 | 72 20 61 73 20 61 6e 63 |third di|r as anc|
|00001920| 65 73 74 6f 72 73 22 20 | 65 64 69 66 66 2d 6d 65 |estors" |ediff-me|
|00001930| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 69 65 73 2d |rge-dire|ctories-|
|00001940| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 20 65 64 |with-anc|estor ed|
|00001950| 69 72 2d 6d 65 72 67 65 | 2d 72 65 76 69 73 69 6f |ir-merge|-revisio|
|00001960| 6e 73 20 22 4d 65 72 67 | 65 20 76 65 72 73 69 6f |ns "Merg|e versio|
|00001970| 6e 73 20 6f 66 20 66 69 | 6c 65 73 20 69 6e 20 61 |ns of fi|les in a|
|00001980| 20 64 69 72 65 63 74 6f | 72 79 22 20 65 64 69 66 | directo|ry" edif|
|00001990| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|000019a0| 79 2d 72 65 76 69 73 69 | 6f 6e 73 20 65 64 69 66 |y-revisi|ons edif|
|000019b0| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|000019c0| 79 2d 72 65 76 69 73 69 | 6f 6e 73 2d 77 69 74 68 |y-revisi|ons-with|
|000019d0| 2d 61 6e 63 65 73 74 6f | 72 20 22 4d 65 72 67 65 |-ancesto|r "Merge|
|000019e0| 20 76 65 72 73 69 6f 6e | 73 20 6f 66 20 66 69 6c | version|s of fil|
|000019f0| 65 73 20 69 6e 20 61 20 | 64 69 72 65 63 74 6f 72 |es in a |director|
|00001a00| 79 20 75 73 69 6e 67 20 | 6f 74 68 65 72 20 76 65 |y using |other ve|
|00001a10| 72 73 69 6f 6e 73 20 61 | 73 20 61 6e 63 65 73 74 |rsions a|s ancest|
|00001a20| 6f 72 73 22 20 65 64 69 | 72 2d 6d 65 72 67 65 2d |ors" edi|r-merge-|
|00001a30| 72 65 76 69 73 69 6f 6e | 73 2d 77 69 74 68 2d 61 |revision|s-with-a|
|00001a40| 6e 63 65 73 74 6f 72 20 | 70 72 6f 76 69 64 65 20 |ncestor |provide |
|00001a50| 65 64 69 66 66 2d 68 6f | 6f 6b 5d 20 35 29 0a    |ediff-ho|ok] 5). |
+--------+-------------------------+-------------------------+--------+--------+