<?xml version="1.0"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
	<id>https://wiki.apertium.org/w/index.php?action=history&amp;feed=atom&amp;title=Talk%3ADixtools%3A_Merge_dictionaries</id>
	<title>Talk:Dixtools: Merge dictionaries - Revision history</title>
	<link rel="self" type="application/atom+xml" href="https://wiki.apertium.org/w/index.php?action=history&amp;feed=atom&amp;title=Talk%3ADixtools%3A_Merge_dictionaries"/>
	<link rel="alternate" type="text/html" href="https://wiki.apertium.org/w/index.php?title=Talk:Dixtools:_Merge_dictionaries&amp;action=history"/>
	<updated>2026-04-16T07:38:58Z</updated>
	<subtitle>Revision history for this page on the wiki</subtitle>
	<generator>MediaWiki 1.34.1</generator>
	<entry>
		<id>https://wiki.apertium.org/w/index.php?title=Talk:Dixtools:_Merge_dictionaries&amp;diff=43462&amp;oldid=prev</id>
		<title>Jimregan: autorestrict, not fix</title>
		<link rel="alternate" type="text/html" href="https://wiki.apertium.org/w/index.php?title=Talk:Dixtools:_Merge_dictionaries&amp;diff=43462&amp;oldid=prev"/>
		<updated>2013-08-22T12:58:47Z</updated>

		<summary type="html">&lt;p&gt;autorestrict, not fix&lt;/p&gt;
&lt;table class=&quot;diff diff-contentalign-left&quot; data-mw=&quot;interface&quot;&gt;
				&lt;col class=&quot;diff-marker&quot; /&gt;
				&lt;col class=&quot;diff-content&quot; /&gt;
				&lt;col class=&quot;diff-marker&quot; /&gt;
				&lt;col class=&quot;diff-content&quot; /&gt;
				&lt;tr class=&quot;diff-title&quot; lang=&quot;en&quot;&gt;
				&lt;td colspan=&quot;2&quot; style=&quot;background-color: #fff; color: #222; text-align: center;&quot;&gt;← Older revision&lt;/td&gt;
				&lt;td colspan=&quot;2&quot; style=&quot;background-color: #fff; color: #222; text-align: center;&quot;&gt;Revision as of 12:58, 22 August 2013&lt;/td&gt;
				&lt;/tr&gt;&lt;tr&gt;
  &lt;td colspan=&quot;2&quot; class=&quot;diff-lineno&quot;&gt;Line 1:&lt;/td&gt;
  &lt;td colspan=&quot;2&quot; class=&quot;diff-lineno&quot;&gt;Line 1:&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
  &lt;td class=&quot;diff-marker&quot;&gt;&lt;/td&gt;
  &lt;td class=&quot;diff-context diff-side-deleted&quot;&gt;&lt;div&gt;How does it solve conflicts? E.g. if the l entries are the same, but not the r entries (or vice versa).&lt;/div&gt;&lt;/td&gt;
  &lt;td class=&quot;diff-marker&quot;&gt;&lt;/td&gt;
  &lt;td class=&quot;diff-context diff-side-added&quot;&gt;&lt;div&gt;How does it solve conflicts? E.g. if the l entries are the same, but not the r entries (or vice versa).&lt;/div&gt;&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
  &lt;td class=&quot;diff-marker&quot; data-marker=&quot;−&quot;&gt;&lt;/td&gt;
  &lt;td class=&quot;diff-deletedline diff-side-deleted&quot;&gt;&lt;div&gt;:It just merges. If you have two entries with one side the same, the output will have both of those entries. Try the dixtools &lt;del class=&quot;diffchange diffchange-inline&quot;&gt;fix&lt;/del&gt; tool on the merged dictionary if you want automatic restrictions added -- [[User:Jimregan|Jimregan]] &lt;del class=&quot;diffchange diffchange-inline&quot;&gt;11:&lt;/del&gt;12, 22 August 2013 (UTC)&lt;/div&gt;&lt;/td&gt;
  &lt;td class=&quot;diff-marker&quot; data-marker=&quot;+&quot;&gt;&lt;/td&gt;
  &lt;td class=&quot;diff-addedline diff-side-added&quot;&gt;&lt;div&gt;:It just merges. If you have two entries with one side the same, the output will have both of those entries. Try the dixtools &lt;ins class=&quot;diffchange diffchange-inline&quot;&gt;autorestrict&lt;/ins&gt; tool on the merged dictionary if you want automatic restrictions added -- [[User:Jimregan|Jimregan]] 12&lt;ins class=&quot;diffchange diffchange-inline&quot;&gt;:58&lt;/ins&gt;, 22 August 2013 (UTC)&lt;/div&gt;&lt;/td&gt;
&lt;/tr&gt;
&lt;/table&gt;</summary>
		<author><name>Jimregan</name></author>
		
	</entry>
	<entry>
		<id>https://wiki.apertium.org/w/index.php?title=Talk:Dixtools:_Merge_dictionaries&amp;diff=43461&amp;oldid=prev</id>
		<title>Jimregan: it just merges</title>
		<link rel="alternate" type="text/html" href="https://wiki.apertium.org/w/index.php?title=Talk:Dixtools:_Merge_dictionaries&amp;diff=43461&amp;oldid=prev"/>
		<updated>2013-08-22T11:12:54Z</updated>

		<summary type="html">&lt;p&gt;it just merges&lt;/p&gt;
&lt;table class=&quot;diff diff-contentalign-left&quot; data-mw=&quot;interface&quot;&gt;
				&lt;col class=&quot;diff-marker&quot; /&gt;
				&lt;col class=&quot;diff-content&quot; /&gt;
				&lt;col class=&quot;diff-marker&quot; /&gt;
				&lt;col class=&quot;diff-content&quot; /&gt;
				&lt;tr class=&quot;diff-title&quot; lang=&quot;en&quot;&gt;
				&lt;td colspan=&quot;2&quot; style=&quot;background-color: #fff; color: #222; text-align: center;&quot;&gt;← Older revision&lt;/td&gt;
				&lt;td colspan=&quot;2&quot; style=&quot;background-color: #fff; color: #222; text-align: center;&quot;&gt;Revision as of 11:12, 22 August 2013&lt;/td&gt;
				&lt;/tr&gt;&lt;tr&gt;
  &lt;td colspan=&quot;2&quot; class=&quot;diff-lineno&quot;&gt;Line 1:&lt;/td&gt;
  &lt;td colspan=&quot;2&quot; class=&quot;diff-lineno&quot;&gt;Line 1:&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
  &lt;td class=&quot;diff-marker&quot;&gt;&lt;/td&gt;
  &lt;td class=&quot;diff-context diff-side-deleted&quot;&gt;&lt;div&gt;How does it solve conflicts? E.g. if the l entries are the same, but not the r entries (or vice versa).&lt;/div&gt;&lt;/td&gt;
  &lt;td class=&quot;diff-marker&quot;&gt;&lt;/td&gt;
  &lt;td class=&quot;diff-context diff-side-added&quot;&gt;&lt;div&gt;How does it solve conflicts? E.g. if the l entries are the same, but not the r entries (or vice versa).&lt;/div&gt;&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
  &lt;td colspan=&quot;2&quot; class=&quot;diff-empty diff-side-deleted&quot;&gt;&lt;/td&gt;
  &lt;td class=&quot;diff-marker&quot; data-marker=&quot;+&quot;&gt;&lt;/td&gt;
  &lt;td class=&quot;diff-addedline diff-side-added&quot;&gt;&lt;div&gt;:It just merges. If you have two entries with one side the same, the output will have both of those entries. Try the dixtools fix tool on the merged dictionary if you want automatic restrictions added -- [[User:Jimregan|Jimregan]] 11:12, 22 August 2013 (UTC)&lt;/div&gt;&lt;/td&gt;
&lt;/tr&gt;
&lt;/table&gt;</summary>
		<author><name>Jimregan</name></author>
		
	</entry>
	<entry>
		<id>https://wiki.apertium.org/w/index.php?title=Talk:Dixtools:_Merge_dictionaries&amp;diff=43458&amp;oldid=prev</id>
		<title>Unhammer: Created page with &#039;How does it solve conflicts? E.g. if the l entries are the same, but not the r entries (or vice versa).&#039;</title>
		<link rel="alternate" type="text/html" href="https://wiki.apertium.org/w/index.php?title=Talk:Dixtools:_Merge_dictionaries&amp;diff=43458&amp;oldid=prev"/>
		<updated>2013-08-22T08:55:23Z</updated>

		<summary type="html">&lt;p&gt;Created page with &amp;#039;How does it solve conflicts? E.g. if the l entries are the same, but not the r entries (or vice versa).&amp;#039;&lt;/p&gt;
&lt;p&gt;&lt;b&gt;New page&lt;/b&gt;&lt;/p&gt;&lt;div&gt;How does it solve conflicts? E.g. if the l entries are the same, but not the r entries (or vice versa).&lt;/div&gt;</summary>
		<author><name>Unhammer</name></author>
		
	</entry>
</feed>