56.8 KB
/srv/reproducible-results/rbuild-debian/r-b-build.UltguA7F/b1/mercurial-evolve_10.5.3-4_armhf.changes vs.
/srv/reproducible-results/rbuild-debian/r-b-build.UltguA7F/b2/mercurial-evolve_10.5.3-4_armhf.changes
206 B
Files
    
Offset 1, 2 lines modifiedOffset 1, 2 lines modified
  
1 ·2ce700c0121afe39c884923b6f1b6620·481300·vcs·optional·mercurial-evolve_10.5.3-4_all.deb1 ·5f90c502ec638724f7c4c4b18607e97a·481984·vcs·optional·mercurial-evolve_10.5.3-4_all.deb
56.4 KB
mercurial-evolve_10.5.3-4_all.deb
367 B
file list
    
Offset 1, 3 lines modifiedOffset 1, 3 lines modified
1 -rw-r--r--···0········0········0········4·2023-02-07·13:16:54.000000·debian-binary1 -rw-r--r--···0········0········0········4·2023-02-07·13:16:54.000000·debian-binary
2 -rw-r--r--···0········0········0·····4136·2023-02-07·13:16:54.000000·control.tar.xz2 -rw-r--r--···0········0········0·····4136·2023-02-07·13:16:54.000000·control.tar.xz
3 -rw-r--r--···0········0········0···476972·2023-02-07·13:16:54.000000·data.tar.xz3 -rw-r--r--···0········0········0···477656·2023-02-07·13:16:54.000000·data.tar.xz
636 B
control.tar.xz
608 B
control.tar
538 B
./control
    
Offset 1, 12 lines modifiedOffset 1, 12 lines modified
1 Package:·mercurial-evolve1 Package:·mercurial-evolve
2 Version:·10.5.3-42 Version:·10.5.3-4
3 Architecture:·all3 Architecture:·all
4 Maintainer:·Debian·Python·Team·<team+python@tracker.debian.org>4 Maintainer:·Debian·Python·Team·<team+python@tracker.debian.org>
5 Installed-Size:·21015 Installed-Size:·2102
6 Depends:·python3:any,·libjs-sphinxdoc·(>=·5.2),·mercurial·(>=·4.8),·python3-cbor6 Depends:·python3:any,·libjs-sphinxdoc·(>=·5.2),·mercurial·(>=·4.8),·python3-cbor
7 Built-Using:·sphinx·(=·5.3.0-4)7 Built-Using:·sphinx·(=·5.3.0-4)
8 Section:·vcs8 Section:·vcs
9 Priority:·optional9 Priority:·optional
10 Homepage:·https://www.mercurial-scm.org/doc/evolution/10 Homepage:·https://www.mercurial-scm.org/doc/evolution/
11 Description:·evolve·extension·for·Mercurial11 Description:·evolve·extension·for·Mercurial
12 ·This·package·provides·the·experimental·"evolve"·extension·for·the·Mercurial12 ·This·package·provides·the·experimental·"evolve"·extension·for·the·Mercurial
48.0 B
./md5sums
30.0 B
./md5sums
Files differ
55.3 KB
data.tar.xz
55.3 KB
data.tar
3.91 KB
file list
    
Offset 115, 26 lines modifiedOffset 115, 26 lines modified
115 -rw-r--r--···0·root·········(0)·root·········(0)······299·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/graphviz.css115 -rw-r--r--···0·root·········(0)·root·········(0)······299·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/graphviz.css
116 -rw-r--r--···0·root·········(0)·root·········(0)·····6714·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/haiku.css116 -rw-r--r--···0·root·········(0)·root·········(0)·····6714·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/haiku.css
117 -rw-r--r--···0·root·········(0)·root·········(0)·····1728·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/logo-evolve.ico.gz117 -rw-r--r--···0·root·········(0)·root·········(0)·····1728·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/logo-evolve.ico.gz
118 -rw-r--r--···0·root·········(0)·root·········(0)···107444·2022-06-25·10:48:29.000000·./usr/share/doc/mercurial-evolve/html/_static/logo-evolve.svg118 -rw-r--r--···0·root·········(0)·root·········(0)···107444·2022-06-25·10:48:29.000000·./usr/share/doc/mercurial-evolve/html/_static/logo-evolve.svg
119 -rw-r--r--···0·root·········(0)·root·········(0)·······90·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/minus.png119 -rw-r--r--···0·root·········(0)·root·········(0)·······90·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/minus.png
120 -rw-r--r--···0·root·········(0)·root·········(0)·······90·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/plus.png120 -rw-r--r--···0·root·········(0)·root·········(0)·······90·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/plus.png
121 -rw-r--r--···0·root·········(0)·root·········(0)·····4846·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/pygments.css121 -rw-r--r--···0·root·········(0)·root·········(0)·····4846·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/pygments.css
122 -rw-r--r--···0·root·········(0)·root·········(0)····26959·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/commands.html122 -rw-r--r--···0·root·········(0)·root·········(0)····27399·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/commands.html
123 -rw-r--r--···0·root·········(0)·root·········(0)····14285·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/concepts.html123 -rw-r--r--···0·root·········(0)·root·········(0)····14285·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/concepts.html
124 -rw-r--r--···0·root·········(0)·root·········(0)····15013·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/evolve-faq.html124 -rw-r--r--···0·root·········(0)·root·········(0)····15013·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/evolve-faq.html
125 -rw-r--r--···0·root·········(0)·root·········(0)·····4868·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/evolve-good-practice.html125 -rw-r--r--···0·root·········(0)·root·········(0)·····4868·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/evolve-good-practice.html
126 -rw-r--r--···0·root·········(0)·root·········(0)····15194·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/from-mq.html126 -rw-r--r--···0·root·········(0)·root·········(0)····15194·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/from-mq.html
127 -rw-r--r--···0·root·········(0)·root·········(0)·····1919·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/genindex.html127 -rw-r--r--···0·root·········(0)·root·········(0)·····1919·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/genindex.html
128 -rw-r--r--···0·root·········(0)·root·········(0)····16824·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/index.html128 -rw-r--r--···0·root·········(0)·root·········(0)····16824·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/index.html
129 -rw-r--r--···0·root·········(0)·root·········(0)·····6486·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/known-doc-issues.html129 -rw-r--r--···0·root·········(0)·root·········(0)·····6486·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/known-doc-issues.html
130 -rw-r--r--···0·root·········(0)·root·········(0)······661·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/objects.inv130 -rw-r--r--···0·root·········(0)·root·········(0)······661·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/objects.inv
131 -rw-r--r--···0·root·········(0)·root·········(0)····11974·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/obs-terms.html131 -rw-r--r--···0·root·········(0)·root·········(0)····11974·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/obs-terms.html
132 -rw-r--r--···0·root·········(0)·root·········(0)·····2683·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/search.html132 -rw-r--r--···0·root·········(0)·root·········(0)·····2683·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/search.html
133 -rw-r--r--···0·root·········(0)·root·········(0)····50412·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/searchindex.js133 -rw-r--r--···0·root·········(0)·root·········(0)····51401·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/searchindex.js
134 -rw-r--r--···0·root·········(0)·root·········(0)····54591·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/sharing.html134 -rw-r--r--···0·root·········(0)·root·········(0)····54591·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/sharing.html
135 -rw-r--r--···0·root·········(0)·root·········(0)····34478·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/troubles-handling.html135 -rw-r--r--···0·root·········(0)·root·········(0)····34478·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/troubles-handling.html
136 drwxr-xr-x···0·root·········(0)·root·········(0)········0·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorial/136 drwxr-xr-x···0·root·········(0)·root·········(0)········0·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorial/
137 -rw-r--r--···0·root·········(0)·root·········(0)·····4551·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorial/README.html137 -rw-r--r--···0·root·········(0)·root·········(0)·····4551·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorial/README.html
138 drwxr-xr-x···0·root·········(0)·root·········(0)········0·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorials/138 drwxr-xr-x···0·root·········(0)·root·········(0)········0·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorials/
139 -rw-r--r--···0·root·········(0)·root·········(0)····63260·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorials/topic-tutorial.html139 -rw-r--r--···0·root·········(0)·root·········(0)····63260·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorials/topic-tutorial.html
140 -rw-r--r--···0·root·········(0)·root·········(0)····57269·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorials/tutorial.html140 -rw-r--r--···0·root·········(0)·root·········(0)····57269·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorials/tutorial.html
37.2 KB
./usr/share/doc/mercurial-evolve/html/commands.html
    
Offset 39, 17 lines modifiedOffset 39, 17 lines modified
39 ······<div·class="content"·role="main">39 ······<div·class="content"·role="main">
40 ········40 ········
41 ········41 ········
42 ··<section·id="evolve-commands-reference">42 ··<section·id="evolve-commands-reference">
43 <h1>Evolve·Commands·Reference<a·class="headerlink"·href="#evolve-commands-reference"·title="Permalink·to·this·heading">¶</a></h1>43 <h1>Evolve·Commands·Reference<a·class="headerlink"·href="#evolve-commands-reference"·title="Permalink·to·this·heading">¶</a></h1>
44 <section·id="amend">44 <section·id="amend">
45 <h2>amend<a·class="headerlink"·href="#amend"·title="Permalink·to·this·heading">¶</a></h2>45 <h2>amend<a·class="headerlink"·href="#amend"·title="Permalink·to·this·heading">¶</a></h2>
46 <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·amend·[OPTION]...·[FILE]...46 <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·amend·[OPZIONE]...·[FILE]...
  
47 aliases:·refresh47 alias:·refresh
  
48 combine·a·changeset·with·updates·and·replace·it·with·a·new·one48 combine·a·changeset·with·updates·and·replace·it·with·a·new·one
  
49 ····Commits·a·new·changeset·incorporating·both·the·changes·to·the·given·files49 ····Commits·a·new·changeset·incorporating·both·the·changes·to·the·given·files
50 ····and·all·the·changes·from·the·current·parent·changeset·into·the·repository.50 ····and·all·the·changes·from·the·current·parent·changeset·into·the·repository.
  
51 ····See·&#39;hg·commit&#39;·for·details·about·committing·changes.51 ····See·&#39;hg·commit&#39;·for·details·about·committing·changes.
Offset 60, 43 lines modifiedOffset 60, 43 lines modified
60 ····to·selected·files·in·the·checked·out·revision·appear·again·as·uncommitted60 ····to·selected·files·in·the·checked·out·revision·appear·again·as·uncommitted
61 ····changed·in·the·working·directory.61 ····changed·in·the·working·directory.
  
62 ····Returns·0·on·success,·1·if·nothing·changed.62 ····Returns·0·on·success,·1·if·nothing·changed.
  
63 options·([+]·can·be·repeated):63 options·([+]·can·be·repeated):
  
64 ·-A·--addremove···········mark·new/missing·files·as·added/removed·before 
65 ··························committing64 ·-A·--addremove···········marca·file·nuovi/mancanti·come·aggiunti/rimossi
 65 ··························prima·di·effettuare·il·commit
66 ·-a·--all·················match·all·files66 ·-a·--all·················match·all·files
67 ·-e·--edit················invoke·editor·on·commit·messages67 ·-e·--edit················invoke·editor·on·commit·messages
68 ····--extract·············extract·changes·from·the·commit·to·the·working·copy68 ····--extract·············extract·changes·from·the·commit·to·the·working·copy
69 ····--patch···············make·changes·to·wdir·parent·by·editing·patch69 ····--patch···············make·changes·to·wdir·parent·by·editing·patch
70 ····--close-branch········mark·a·branch·as·closed,·hiding·it·from·the·branch 
71 ··························list70 ····--close-branch········marca·una·branch·come·chiusa,·nascondendola
 71 ··························dall&#39;elenco·delle·branch
72 ·-s·--secret··············use·the·secret·phase·for·committing72 ·-s·--secret··············use·the·secret·phase·for·committing
73 ·-n·--note·TEXT···········store·a·note·on·amend73 ·-n·--note·TESTO··········store·a·note·on·amend
74 ·-I·--include·PATTERN·[+]·include·names·matching·the·given·patterns 
75 ·-X·--exclude·PATTERN·[+]·exclude·names·matching·the·given·patterns 
76 ·-m·--message·TEXT········use·text·as·commit·message 
77 ·-l·--logfile·FILE········read·commit·message·from·file74 ·-I·--include·PATTERN·[+]·include·nomi·che·corrispondono·ai·pattern·dati
 75 ·-X·--exclude·PATTERN·[+]·esclude·nomi·che·corrispondono·ai·pattern·dati
 76 ·-m·--message·TESTO·······usa·text·come·messaggio·di·commit
 77 ·-l·--logfile·FILE········legge·il·messaggio·di·commit·dal·file
78 ·-d·--date·DATE···········record·the·specified·date·as·commit·date78 ·-d·--date·DATA···········record·the·specified·date·as·commit·date
79 ·-u·--user·USER···········record·the·specified·user·as·committer79 ·-u·--user·UTENTE·········registra·l&#39;utente·specificato·come·autore·del·commit
80 ·-D·--current-date········record·the·current·date·as·commit·date80 ·-D·--current-date········record·the·current·date·as·commit·date
81 ·-U·--current-user········record·the·current·user·as·committer81 ·-U·--current-user········record·the·current·user·as·committer
82 ·-i·--interactive·········use·interactive·mode82 ·-i·--interactive·········use·interactive·mode
  
83 (some·details·hidden,·use·--verbose·to·show·complete·help)83 (some·details·hidden,·use·--verbose·to·show·complete·help)
84 </pre></div>84 </pre></div>
85 </div>85 </div>
86 </section>86 </section>
87 <section·id="evolve">87 <section·id="evolve">
88 <h2>evolve<a·class="headerlink"·href="#evolve"·title="Permalink·to·this·heading">¶</a></h2>88 <h2>evolve<a·class="headerlink"·href="#evolve"·title="Permalink·to·this·heading">¶</a></h2>
89 <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·evolve·[OPTIONS]...89 <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·evolve·[OPTIONS]...
  
90 aliases:·stabilize,·solve90 alias:·stabilize,·solve
  
91 solve·troubled·changesets·in·your·repository91 solve·troubled·changesets·in·your·repository
  
92 ····Modifying·history·can·lead·to·various·types·of·troubled·changesets:92 ····Modifying·history·can·lead·to·various·types·of·troubled·changesets:
93 ····orphan,·phase-divergent,·or·content-divergent.·The·evolve·command·resolves93 ····orphan,·phase-divergent,·or·content-divergent.·The·evolve·command·resolves
94 ····your·troubles·by·executing·one·of·the·following·actions:94 ····your·troubles·by·executing·one·of·the·following·actions:
  
Offset 196, 47 lines modifiedOffset 196, 47 lines modified
196 ·-a·--all···············evolve·all·troubled·changesets·related·to·the·current196 ·-a·--all···············evolve·all·troubled·changesets·related·to·the·current
197 ························working·directory·and·its·descendants·(default)197 ························working·directory·and·its·descendants·(default)
198 ····--update············update·to·the·head·of·evolved·changesets198 ····--update············update·to·the·head·of·evolved·changesets
199 ·-c·--continue··········continue·an·interrupted·evolution199 ·-c·--continue··········continue·an·interrupted·evolution
200 ····--stop··············stop·the·interrupted·evolution200 ····--stop··············stop·the·interrupted·evolution
201 ····--abort·············abort·the·interrupted·evolution201 ····--abort·············abort·the·interrupted·evolution
202 ·-l·--list··············provide·details·on·troubled·changesets·in·the·repo202 ·-l·--list··············provide·details·on·troubled·changesets·in·the·repo
203 ·-t·--tool·TOOL·········specify·merge·tool203 ·-t·--tool·TOOL·········specifica·lo·strumento·da·usare·per·i·merge
  
204 (some·details·hidden,·use·--verbose·to·show·complete·help)204 (some·details·hidden,·use·--verbose·to·show·complete·help)
205 </pre></div>205 </pre></div>
206 </div>206 </div>
207 </section>207 </section>
208 <section·id="fold">208 <section·id="fold">
209 <h2>fold<a·class="headerlink"·href="#fold"·title="Permalink·to·this·heading">¶</a></h2>209 <h2>fold<a·class="headerlink"·href="#fold"·title="Permalink·to·this·heading">¶</a></h2>
210 <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·fold·[OPTION]...·[-r]·REV...210 <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·fold·[OPTION]...·[-r]·REV...
  
211 aliases:·squash211 alias:·squash
  
212 fold·multiple·revisions·into·a·single·one212 fold·multiple·revisions·into·a·single·one
  
213 ····With·--from,·folds·all·the·revisions·linearly·between·the·given·revisions213 ····With·--from,·folds·all·the·revisions·linearly·between·the·given·revisions
214 ····and·the·parent·of·the·working·directory.214 ····and·the·parent·of·the·working·directory.
  
215 ····With·--exact,·folds·only·the·specified·revisions·while·ignoring·the·parent215 ····With·--exact,·folds·only·the·specified·revisions·while·ignoring·the·parent
216 ····of·the·working·directory.·In·this·case,·the·given·revisions·must·form·a216 ····of·the·working·directory.·In·this·case,·the·given·revisions·must·form·a
217 ····linear·unbroken·chain.217 ····linear·unbroken·chain.
  
218 options·([+]·can·be·repeated):218 options·([+]·can·be·repeated):
  
219 ·-r·--rev·REV·[+]··revision·to·fold219 ·-r·--rev·REV·[+]···revision·to·fold
220 ····--exact········only·fold·specified·revisions220 ····--exact·········only·fold·specified·revisions
221 ····--from·········fold·revisions·linearly·to·working·copy·parent221 ····--from··········fold·revisions·linearly·to·working·copy·parent
222 ·-n·--note·TEXT····store·a·note·on·fold222 ·-n·--note·TESTO····store·a·note·on·fold
223 ·-m·--message·TEXT·use·text·as·commit·message 
224 ·-l·--logfile·FILE·read·commit·message·from·file223 ·-m·--message·TESTO·usa·text·come·messaggio·di·commit
 224 ·-l·--logfile·FILE··legge·il·messaggio·di·commit·dal·file
225 ·-d·--date·DATE····record·the·specified·date·as·commit·date225 ·-d·--date·DATA·····record·the·specified·date·as·commit·date
226 ·-u·--user·USER····record·the·specified·user·as·committer226 ·-u·--user·UTENTE···registra·l&#39;utente·specificato·come·autore·del·commit
227 ·-D·--current-date·record·the·current·date·as·commit·date227 ·-D·--current-date··record·the·current·date·as·commit·date
228 ·-U·--current-user·record·the·current·user·as·committer228 ·-U·--current-user··record·the·current·user·as·committer
  
229 (some·details·hidden,·use·--verbose·to·show·complete·help)229 (some·details·hidden,·use·--verbose·to·show·complete·help)
230 </pre></div>230 </pre></div>
231 </div>231 </div>
232 </section>232 </section>
233 <section·id="metaedit">233 <section·id="metaedit">
234 <h2>metaedit<a·class="headerlink"·href="#metaedit"·title="Permalink·to·this·heading">¶</a></h2>234 <h2>metaedit<a·class="headerlink"·href="#metaedit"·title="Permalink·to·this·heading">¶</a></h2>
Offset 248, 23 lines modifiedOffset 248, 23 lines modified
248 ····edits·commit·information·for·the·working·directory·parent.248 ····edits·commit·information·for·the·working·directory·parent.
  
249 ····With·--fold,·also·folds·multiple·revisions·into·one·if·necessary.·In·this249 ····With·--fold,·also·folds·multiple·revisions·into·one·if·necessary.·In·this
250 ····case,·the·given·revisions·must·form·a·linear·unbroken·chain.250 ····case,·the·given·revisions·must·form·a·linear·unbroken·chain.
  
251 options·([+]·can·be·repeated):251 options·([+]·can·be·repeated):
  
252 ·-r·--rev·REV·[+]··revision·to·edit252 ·-r·--rev·REV·[+]···revision·to·edit
253 ····--fold·········also·fold·specified·revisions·into·one253 ····--fold··········also·fold·specified·revisions·into·one
254 ·-n·--note·TEXT····store·a·note·on·metaedit254 ·-n·--note·TESTO····store·a·note·on·metaedit
255 ·-m·--message·TEXT·use·text·as·commit·message 
Max diff block lines reached; 12118/19720 bytes (61.45%) of diff not shown.
17.8 KB
html2text {}
    
Offset 8, 17 lines modifiedOffset 8, 17 lines modified
  
8 ******·evolve_extension_for_Mercurial·******8 ******·evolve_extension_for_Mercurial·******
9 *****·Evolve·Commands·Reference·*****9 *****·Evolve·Commands·Reference·*****
10 «  From_MQ_To_Evolve,_The_Refugee_Book·  ::  ·Contents·  ::  ·Known10 «  From_MQ_To_Evolve,_The_Refugee_Book·  ::  ·Contents·  ::  ·Known
11 limitations_of_the_current_documentation  Â»11 limitations_of_the_current_documentation  Â»
12 ******·Evolve·Commands·Reference¶·******12 ******·Evolve·Commands·Reference¶·******
13 *****·amend¶·*****13 *****·amend¶·*****
14 hg·amend·[OPTION]...·[FILE]...14 hg·amend·[OPZIONE]...·[FILE]...
  
15 aliases:·refresh15 alias:·refresh
  
16 combine·a·changeset·with·updates·and·replace·it·with·a·new·one16 combine·a·changeset·with·updates·and·replace·it·with·a·new·one
  
17 ····Commits·a·new·changeset·incorporating·both·the·changes·to·the·given·files17 ····Commits·a·new·changeset·incorporating·both·the·changes·to·the·given·files
18 ····and·all·the·changes·from·the·current·parent·changeset·into·the·repository.18 ····and·all·the·changes·from·the·current·parent·changeset·into·the·repository.
  
19 ····See·'hg·commit'·for·details·about·committing·changes.19 ····See·'hg·commit'·for·details·about·committing·changes.
Offset 29, 40 lines modifiedOffset 29, 40 lines modified
29 ····to·selected·files·in·the·checked·out·revision·appear·again·as·uncommitted29 ····to·selected·files·in·the·checked·out·revision·appear·again·as·uncommitted
30 ····changed·in·the·working·directory.30 ····changed·in·the·working·directory.
  
31 ····Returns·0·on·success,·1·if·nothing·changed.31 ····Returns·0·on·success,·1·if·nothing·changed.
  
32 options·([+]·can·be·repeated):32 options·([+]·can·be·repeated):
  
33 ·-A·--addremove···········mark·new/missing·files·as·added/removed·before 
34 ··························committing33 ·-A·--addremove···········marca·file·nuovi/mancanti·come·aggiunti/rimossi
 34 ··························prima·di·effettuare·il·commit
35 ·-a·--all·················match·all·files35 ·-a·--all·················match·all·files
36 ·-e·--edit················invoke·editor·on·commit·messages36 ·-e·--edit················invoke·editor·on·commit·messages
37 ····--extract·············extract·changes·from·the·commit·to·the·working·copy37 ····--extract·············extract·changes·from·the·commit·to·the·working·copy
38 ····--patch···············make·changes·to·wdir·parent·by·editing·patch38 ····--patch···············make·changes·to·wdir·parent·by·editing·patch
39 ····--close-branch········mark·a·branch·as·closed,·hiding·it·from·the·branch 
40 ··························list39 ····--close-branch········marca·una·branch·come·chiusa,·nascondendola
 40 ··························dall'elenco·delle·branch
41 ·-s·--secret··············use·the·secret·phase·for·committing41 ·-s·--secret··············use·the·secret·phase·for·committing
42 ·-n·--note·TEXT···········store·a·note·on·amend42 ·-n·--note·TESTO··········store·a·note·on·amend
43 ·-I·--include·PATTERN·[+]·include·names·matching·the·given·patterns 
44 ·-X·--exclude·PATTERN·[+]·exclude·names·matching·the·given·patterns 
45 ·-m·--message·TEXT········use·text·as·commit·message 
46 ·-l·--logfile·FILE········read·commit·message·from·file43 ·-I·--include·PATTERN·[+]·include·nomi·che·corrispondono·ai·pattern·dati
 44 ·-X·--exclude·PATTERN·[+]·esclude·nomi·che·corrispondono·ai·pattern·dati
 45 ·-m·--message·TESTO·······usa·text·come·messaggio·di·commit
 46 ·-l·--logfile·FILE········legge·il·messaggio·di·commit·dal·file
47 ·-d·--date·DATE···········record·the·specified·date·as·commit·date47 ·-d·--date·DATA···········record·the·specified·date·as·commit·date
48 ·-u·--user·USER···········record·the·specified·user·as·committer48 ·-u·--user·UTENTE·········registra·l'utente·specificato·come·autore·del·commit
49 ·-D·--current-date········record·the·current·date·as·commit·date49 ·-D·--current-date········record·the·current·date·as·commit·date
50 ·-U·--current-user········record·the·current·user·as·committer50 ·-U·--current-user········record·the·current·user·as·committer
51 ·-i·--interactive·········use·interactive·mode51 ·-i·--interactive·········use·interactive·mode
  
52 (some·details·hidden,·use·--verbose·to·show·complete·help)52 (some·details·hidden,·use·--verbose·to·show·complete·help)
  
53 *****·evolve¶·*****53 *****·evolve¶·*****
54 hg·evolve·[OPTIONS]...54 hg·evolve·[OPTIONS]...
  
55 aliases:·stabilize,·solve55 alias:·stabilize,·solve
  
56 solve·troubled·changesets·in·your·repository56 solve·troubled·changesets·in·your·repository
  
57 ····Modifying·history·can·lead·to·various·types·of·troubled·changesets:57 ····Modifying·history·can·lead·to·various·types·of·troubled·changesets:
58 ····orphan,·phase-divergent,·or·content-divergent.·The·evolve·command·resolves58 ····orphan,·phase-divergent,·or·content-divergent.·The·evolve·command·resolves
59 ····your·troubles·by·executing·one·of·the·following·actions:59 ····your·troubles·by·executing·one·of·the·following·actions:
  
Offset 162, 44 lines modifiedOffset 162, 44 lines modified
162 ·-a·--all···············evolve·all·troubled·changesets·related·to·the·current162 ·-a·--all···············evolve·all·troubled·changesets·related·to·the·current
163 ························working·directory·and·its·descendants·(default)163 ························working·directory·and·its·descendants·(default)
164 ····--update············update·to·the·head·of·evolved·changesets164 ····--update············update·to·the·head·of·evolved·changesets
165 ·-c·--continue··········continue·an·interrupted·evolution165 ·-c·--continue··········continue·an·interrupted·evolution
166 ····--stop··············stop·the·interrupted·evolution166 ····--stop··············stop·the·interrupted·evolution
167 ····--abort·············abort·the·interrupted·evolution167 ····--abort·············abort·the·interrupted·evolution
168 ·-l·--list··············provide·details·on·troubled·changesets·in·the·repo168 ·-l·--list··············provide·details·on·troubled·changesets·in·the·repo
169 ·-t·--tool·TOOL·········specify·merge·tool169 ·-t·--tool·TOOL·········specifica·lo·strumento·da·usare·per·i·merge
  
170 (some·details·hidden,·use·--verbose·to·show·complete·help)170 (some·details·hidden,·use·--verbose·to·show·complete·help)
  
171 *****·fold¶·*****171 *****·fold¶·*****
172 hg·fold·[OPTION]...·[-r]·REV...172 hg·fold·[OPTION]...·[-r]·REV...
  
173 aliases:·squash173 alias:·squash
  
174 fold·multiple·revisions·into·a·single·one174 fold·multiple·revisions·into·a·single·one
  
175 ····With·--from,·folds·all·the·revisions·linearly·between·the·given·revisions175 ····With·--from,·folds·all·the·revisions·linearly·between·the·given·revisions
176 ····and·the·parent·of·the·working·directory.176 ····and·the·parent·of·the·working·directory.
  
177 ····With·--exact,·folds·only·the·specified·revisions·while·ignoring·the·parent177 ····With·--exact,·folds·only·the·specified·revisions·while·ignoring·the·parent
178 ····of·the·working·directory.·In·this·case,·the·given·revisions·must·form·a178 ····of·the·working·directory.·In·this·case,·the·given·revisions·must·form·a
179 ····linear·unbroken·chain.179 ····linear·unbroken·chain.
  
180 options·([+]·can·be·repeated):180 options·([+]·can·be·repeated):
  
181 ·-r·--rev·REV·[+]··revision·to·fold181 ·-r·--rev·REV·[+]···revision·to·fold
182 ····--exact········only·fold·specified·revisions182 ····--exact·········only·fold·specified·revisions
183 ····--from·········fold·revisions·linearly·to·working·copy·parent183 ····--from··········fold·revisions·linearly·to·working·copy·parent
184 ·-n·--note·TEXT····store·a·note·on·fold184 ·-n·--note·TESTO····store·a·note·on·fold
185 ·-m·--message·TEXT·use·text·as·commit·message 
186 ·-l·--logfile·FILE·read·commit·message·from·file185 ·-m·--message·TESTO·usa·text·come·messaggio·di·commit
 186 ·-l·--logfile·FILE··legge·il·messaggio·di·commit·dal·file
187 ·-d·--date·DATE····record·the·specified·date·as·commit·date187 ·-d·--date·DATA·····record·the·specified·date·as·commit·date
188 ·-u·--user·USER····record·the·specified·user·as·committer188 ·-u·--user·UTENTE···registra·l'utente·specificato·come·autore·del·commit
189 ·-D·--current-date·record·the·current·date·as·commit·date189 ·-D·--current-date··record·the·current·date·as·commit·date
190 ·-U·--current-user·record·the·current·user·as·committer190 ·-U·--current-user··record·the·current·user·as·committer
  
191 (some·details·hidden,·use·--verbose·to·show·complete·help)191 (some·details·hidden,·use·--verbose·to·show·complete·help)
  
192 *****·metaedit¶·*****192 *****·metaedit¶·*****
193 hg·metaedit·[OPTION]...·[[-r]·REV]...193 hg·metaedit·[OPTION]...·[[-r]·REV]...
  
194 edit·commit·information194 edit·commit·information
Offset 208, 23 lines modifiedOffset 208, 23 lines modified
208 ····edits·commit·information·for·the·working·directory·parent.208 ····edits·commit·information·for·the·working·directory·parent.
  
209 ····With·--fold,·also·folds·multiple·revisions·into·one·if·necessary.·In·this209 ····With·--fold,·also·folds·multiple·revisions·into·one·if·necessary.·In·this
210 ····case,·the·given·revisions·must·form·a·linear·unbroken·chain.210 ····case,·the·given·revisions·must·form·a·linear·unbroken·chain.
  
211 options·([+]·can·be·repeated):211 options·([+]·can·be·repeated):
  
212 ·-r·--rev·REV·[+]··revision·to·edit212 ·-r·--rev·REV·[+]···revision·to·edit
213 ····--fold·········also·fold·specified·revisions·into·one213 ····--fold··········also·fold·specified·revisions·into·one
214 ·-n·--note·TEXT····store·a·note·on·metaedit214 ·-n·--note·TESTO····store·a·note·on·metaedit
215 ·-m·--message·TEXT·use·text·as·commit·message 
216 ·-l·--logfile·FILE·read·commit·message·from·file215 ·-m·--message·TESTO·usa·text·come·messaggio·di·commit
 216 ·-l·--logfile·FILE··legge·il·messaggio·di·commit·dal·file
217 ·-d·--date·DATE····record·the·specified·date·as·commit·date217 ·-d·--date·DATA·····record·the·specified·date·as·commit·date
218 ·-u·--user·USER····record·the·specified·user·as·committer218 ·-u·--user·UTENTE···registra·l'utente·specificato·come·autore·del·commit
219 ·-D·--current-date·record·the·current·date·as·commit·date219 ·-D·--current-date··record·the·current·date·as·commit·date
220 ·-U·--current-user·record·the·current·user·as·committer220 ·-U·--current-user··record·the·current·user·as·committer
Max diff block lines reached; 11340/18198 bytes (62.31%) of diff not shown.
14.2 KB
./usr/share/doc/mercurial-evolve/html/searchindex.js
14.1 KB
js-beautify {}
    
Offset 1, 16 lines modifiedOffset 1, 16 lines modified
1 Search.setIndex({1 Search.setIndex({
2 ····"docnames":·["commands",·"concepts",·"evolve-faq",·"evolve-good-practice",·"from-mq",·"index",·"known-doc-issues",·"obs-terms",·"sharing",·"troubles-handling",·"tutorial/README",·"tutorials/topic-tutorial",·"tutorials/tutorial",·"user-guide"],2 ····"docnames":·["commands",·"concepts",·"evolve-faq",·"evolve-good-practice",·"from-mq",·"index",·"known-doc-issues",·"obs-terms",·"sharing",·"troubles-handling",·"tutorial/README",·"tutorials/topic-tutorial",·"tutorials/tutorial",·"user-guide"],
3 ····"filenames":·["commands.rst",·"concepts.rst",·"evolve-faq.rst",·"evolve-good-practice.rst",·"from-mq.rst",·"index.rst",·"known-doc-issues.rst",·"obs-terms.rst",·"sharing.rst",·"troubles-handling.rst",·"tutorial/README.rst",·"tutorials/topic-tutorial.rst",·"tutorials/tutorial.rst",·"user-guide.rst"],3 ····"filenames":·["commands.rst",·"concepts.rst",·"evolve-faq.rst",·"evolve-good-practice.rst",·"from-mq.rst",·"index.rst",·"known-doc-issues.rst",·"obs-terms.rst",·"sharing.rst",·"troubles-handling.rst",·"tutorial/README.rst",·"tutorials/topic-tutorial.rst",·"tutorials/tutorial.rst",·"user-guide.rst"],
4 ····"titles":·["Evolve·Commands·Reference",·"Evolve:·Concepts",·"Evolve·How·To",·"Good·practice·for·(early)·users·of·evolve",·"From·MQ·To·Evolve,·The·Refugee·Book",·"Changeset·Evolution·with·Mercurial",·"Known·limitations·of·the·current·documentation",·"Terminology·of·the·obsolete·concept",·"Evolve:·Shared·Mutable·History",·"Possible·troubles·in·rewriting·history·and·their·resolution",·"Training·supports",·"Topic·Tutorial",·"Initial·setup",·"Evolve:·User·Guide"],4 ····"titles":·["Evolve·Commands·Reference",·"Evolve:·Concepts",·"Evolve·How·To",·"Good·practice·for·(early)·users·of·evolve",·"From·MQ·To·Evolve,·The·Refugee·Book",·"Changeset·Evolution·with·Mercurial",·"Known·limitations·of·the·current·documentation",·"Terminology·of·the·obsolete·concept",·"Evolve:·Shared·Mutable·History",·"Possible·troubles·in·rewriting·history·and·their·resolution",·"Training·supports",·"Topic·Tutorial",·"Initial·setup",·"Evolve:·User·Guide"],
5 ····"terms":·{5 ····"terms":·{
6 ········"hg":·[0,·1,·2,·5,·6,·7,·8,·11,·13],6 ········"hg":·[0,·1,·2,·5,·6,·7,·8,·11,·13],
7 ········"option":·[0,·4,·8,·11,·12,·13],7 ········"opzion":·0,
8 ········"file":·[0,·5,·7,·8,·10,·11,·12],8 ········"file":·[0,·5,·7,·8,·10,·11,·12],
9 ········"alias":·[0,·2,·12],9 ········"alia":·[0,·2,·4,·12],
10 ········"refresh":·0,10 ········"refresh":·0,
11 ········"combin":·[0,·2,·7,·13],11 ········"combin":·[0,·2,·7,·13],
12 ········"changeset":·[0,·4,·6,·11],12 ········"changeset":·[0,·4,·6,·11],
13 ········"updat":·[0,·4,·5,·8,·11,·12,·13],13 ········"updat":·[0,·4,·5,·8,·11,·12,·13],
14 ········"replac":·[0,·1,·2,·5,·7,·8,·10,·12,·13],14 ········"replac":·[0,·1,·2,·5,·7,·8,·10,·12,·13],
15 ········"new":·[0,·1,·2,·4,·5,·7,·9,·11,·12],15 ········"new":·[0,·1,·2,·4,·5,·7,·9,·11,·12],
16 ········"one":·[0,·1,·2,·5,·7,·8,·11,·12],16 ········"one":·[0,·1,·2,·5,·7,·8,·11,·12],
Offset 49, 56 lines modifiedOffset 49, 81 lines modified
49 ········"work":·[0,·1,·3,·4,·5,·7,·8,·12,·13],49 ········"work":·[0,·1,·3,·4,·5,·7,·8,·12,·13],
50 ········"directori":·[0,·2,·4,·7,·8,·10,·11,·12,·13],50 ········"directori":·[0,·2,·4,·7,·8,·10,·11,·12,·13],
51 ········"return":·[0,·12],51 ········"return":·[0,·12],
52 ········"0":·[0,·1,·8,·11,·12,·13],52 ········"0":·[0,·1,·8,·11,·12,·13],
53 ········"success":·0,53 ········"success":·0,
54 ········"1":·[0,·1,·2,·5,·10,·11,·12],54 ········"1":·[0,·1,·2,·5,·10,·11,·12],
55 ········"noth":·[0,·8,·11],55 ········"noth":·[0,·8,·11],
 56 ········"option":·[0,·4,·8,·11,·12,·13],
56 ········"can":·[0,·1,·2,·4,·5,·6,·7,·8,·9,·10,·11,·12,·13],57 ········"can":·[0,·1,·2,·4,·5,·6,·7,·8,·9,·10,·11,·12,·13],
57 ········"repeat":·[0,·8,·12],58 ········"repeat":·[0,·8,·12],
58 ········"A":·[0,·1,·2,·4,·7,·8,·11,·12],59 ········"A":·[0,·1,·2,·4,·7,·8,·11,·12],
59 ········"addremov":·0,60 ········"addremov":·0,
 61 ········"marca":·0,
 62 ········"nuovi":·0,
 63 ········"mancanti":·0,
60 ········"mark":·[0,·1,·4,·5,·11,·13],64 ········"come":·[0,·1,·5,·9,·12],
 65 ········"aggiunti":·0,
61 ········"miss":·[0,·1],66 ········"rimossi":·0,
62 ········"ad":·[0,·2,·5,·8,·11,·12,·13], 
63 ········"remov":·[0,·2,·4,·5,·6,·7,·8,·11,·13], 
64 ········"befor":·[0,·3,·5,·8,·9,·11,·13],67 ········"prima":·0,
 68 ········"di":·0,
 69 ········"effettuar":·0,
 70 ········"il":·0,
65 ········"match":·[0,·2,·12],71 ········"match":·[0,·2,·12],
66 ········"e":·[0,·1,·4,·6,·8,·9,·11,·12,·13],72 ········"e":·[0,·1,·4,·6,·8,·9,·11,·12,·13],
67 ········"edit":·[0,·4,·5,·8,·12,·13],73 ········"edit":·[0,·4,·5,·8,·12,·13],
68 ········"invok":·[0,·2],74 ········"invok":·[0,·2],
69 ········"editor":·[0,·4,·8,·13],75 ········"editor":·[0,·4,·8,·13],
70 ········"copi":·[0,·1,·7,·8,·10,·11,·12],76 ········"copi":·[0,·1,·7,·8,·10,·11,·12],
71 ········"patch":·[0,·2,·4,·12,·13],77 ········"patch":·[0,·2,·4,·12,·13],
72 ········"make":·[0,·1,·2,·3,·5,·7,·8,·11,·12,·13],78 ········"make":·[0,·1,·2,·3,·5,·7,·8,·11,·12,·13],
73 ········"wdir":·0,79 ········"wdir":·0,
74 ········"close":·0,80 ········"close":·0,
75 ········"branch":·[0,·4,·7,·8,·11],81 ········"branch":·[0,·4,·7,·8,·11],
 82 ········"una":·0,
 83 ········"chiusa":·0,
 84 ········"nascondendola":·0,
 85 ········"dall":·0,
 86 ········"elenco":·0,
76 ········"hide":·0,87 ········"dell":·0,
77 ········"list":·[0,·4,·5,·6,·7,·9,·11,·12], 
78 ········"secret":·[0,·1,·2,·4,·7,·12],88 ········"secret":·[0,·1,·2,·4,·7,·12],
79 ········"us":·[0,·1,·2,·3,·4,·5,·6,·7,·8,·9,·10,·11,·12,·13],89 ········"us":·[0,·1,·2,·3,·4,·5,·6,·7,·8,·9,·10,·11,·12,·13],
80 ········"phase":·[0,·2,·4,·5,·7,·11,·12,·13],90 ········"phase":·[0,·2,·4,·5,·7,·11,·12,·13],
81 ········"n":·[0,·4,·8,·11,·12,·13],91 ········"n":·[0,·4,·8,·11,·12,·13],
82 ········"note":·[0,·4,·8,·9,·11,·12,·13],92 ········"note":·[0,·4,·8,·9,·11,·12,·13],
83 ········"text":·[0,·8,·9,·12],93 ········"testo":·0,
84 ········"store":·[0,·11,·12],94 ········"store":·[0,·11,·12],
85 ········"includ":·[0,·5,·8,·12],95 ········"includ":·[0,·5,·8,·12],
86 ········"pattern":·[0,·12],96 ········"pattern":·[0,·12],
87 ········"name":·[0,·8,·11,·12,·13],97 ········"nomi":·0,
 98 ········"che":·0,
 99 ········"corrispondono":·0,
 100 ········"ai":·0,
 101 ········"dati":·0,
88 ········"x":·[0,·1,·8,·9,·11,·12,·13],102 ········"x":·[0,·1,·8,·9,·11,·12,·13],
89 ········"exclud":·[0,·7,·12],103 ········"exclud":·[0,·7,·12],
 104 ········"esclud":·0,
 105 ········"usa":·0,
 106 ········"text":·[0,·8,·9,·12],
 107 ········"messaggio":·0,
90 ········"l":·[0,·10,·12,·13],108 ········"l":·[0,·10,·12,·13],
91 ········"logfil":·[0,·12],109 ········"logfil":·[0,·12],
92 ········"read":·[0,·1,·12],110 ········"legg":·0,
 111 ········"dal":·0,
93 ········"d":·[0,·4,·8,·12,·13],112 ········"d":·[0,·4,·8,·12,·13],
94 ········"date":·[0,·5,·8,·11,·12],113 ········"date":·[0,·5,·8,·11,·12],
 114 ········"data":·[0,·12],
95 ········"record":·[0,·2,·4,·12,·13],115 ········"record":·[0,·2,·4,·12,·13],
96 ········"u":·[0,·5,·8,·9,·12,·13],116 ········"u":·[0,·5,·8,·9,·12,·13],
97 ········"user":·[0,·1,·4,·5,·6,·8,·9,·10,·11,·12],117 ········"user":·[0,·1,·4,·5,·6,·8,·9,·10,·11,·12],
 118 ········"utent":·0,
 119 ········"registra":·0,
 120 ········"specificato":·0,
 121 ········"autor":·0,
 122 ········"del":·0,
98 ········"committ":·[0,·12],123 ········"committ":·[0,·12],
99 ········"interact":·[0,·12,·13],124 ········"interact":·[0,·12,·13],
100 ········"mode":·[0,·8,·11],125 ········"mode":·[0,·8,·11],
101 ········"some":·[0,·1,·2,·5,·6,·8,·9,·11,·12,·13],126 ········"some":·[0,·1,·2,·5,·6,·8,·9,·11,·12,·13],
102 ········"hidden":·[0,·2,·5,·7,·8,·12],127 ········"hidden":·[0,·2,·5,·7,·8,·12],
103 ········"verbos":·[0,·11,·12],128 ········"verbos":·[0,·11,·12],
104 ········"show":·[0,·1,·8,·11,·12,·13],129 ········"show":·[0,·1,·8,·11,·12,·13],
Offset 223, 14 lines modifiedOffset 248, 15 lines modified
223 ········"consid":·[0,·4,·9,·11,·13],248 ········"consid":·[0,·4,·9,·11,·13],
224 ········"them":·[0,·1,·3,·4,·7,·8,·9,·11,·13],249 ········"them":·[0,·1,·3,·4,·7,·8,·9,·11,·13],
225 ········"categori":·[0,·1,·7],250 ········"categori":·[0,·1,·7],
226 ········"wish":·0,251 ········"wish":·0,
227 ········"These":·0,252 ········"These":·0,
228 ········"each":·[0,·5,·8,·9],253 ········"each":·[0,·5,·8,·9],
229 ········"other":·[0,·2,·4,·5,·7,·8,·9,·10,·11,·12,·13],254 ········"other":·[0,·2,·4,·5,·7,·8,·9,·10,·11,·12,·13],
 255 ········"list":·[0,·4,·5,·6,·7,·9,·11,·12],
230 ········"affect":·[0,·1,·5,·7,·11,·13],256 ········"affect":·[0,·1,·5,·7,·11,·13],
231 ········"flag":·[0,·12],257 ········"flag":·[0,·12],
232 ········"choos":·[0,·4,·9],258 ········"choos":·[0,·4,·9],
233 ········"displai":·[0,·4,·11,·12],259 ········"displai":·[0,·4,·11,·12],
234 ········"interrupt":·[0,·9],260 ········"interrupt":·[0,·9],
235 ········"purpos":·[0,·1],261 ········"purpos":·[0,·1],
236 ········"tool":·[0,·3,·8,·9,·11,·13],262 ········"tool":·[0,·3,·8,·9,·11,·13],
Offset 266, 23 lines modifiedOffset 292, 30 lines modified
266 ········"dry":·[0,·12],292 ········"dry":·[0,·12],
267 ········"just":·[0,·1,·2,·4,·5,·7,·8,·11,·12,·13],293 ········"just":·[0,·1,·2,·4,·5,·7,·8,·11,·12,·13],
268 ········"print":·0,294 ········"print":·0,
269 ········"would":·[0,·8,·9,·11,·13],295 ········"would":·[0,·8,·9,·11,·13],
270 ········"done":·[0,·8,·9,·11,·13],296 ········"done":·[0,·8,·9,·11,·13],
271 ········"confirm":·0,297 ········"confirm":·0,
272 ········"ask":·0,298 ········"ask":·0,
 299 ········"befor":·[0,·3,·5,·8,·9,·11,·13],
273 ········"unrel":·[0,·13],300 ········"unrel":·[0,·13],
Max diff block lines reached; 9077/14433 bytes (62.89%) of diff not shown.