Translated by Lilian
This commit is contained in:
parent
62a9f973f5
commit
697f1a9411
@ -13378,6 +13378,14 @@ plus.</seg>
|
||||
<seg>@xref{Serveur Emacs}.</seg>
|
||||
</tuv>
|
||||
</tu>
|
||||
<tu>
|
||||
<tuv lang="en">
|
||||
<seg>@xref{Emerge,,, emacs-xtra, Specialized Emacs Features},</seg>
|
||||
</tuv>
|
||||
<tuv lang="fr" changeid="Lilian" changedate="20220517T140016Z" creationid="Lilian" creationdate="20220517T140016Z">
|
||||
<seg>@xref{Emerge,,, emacs-xtra, Caractéristiques spécialisées d'Emacs},</seg>
|
||||
</tuv>
|
||||
</tu>
|
||||
<tu>
|
||||
<tuv lang="en">
|
||||
<seg>@xref{Equality Predicates}.</seg>
|
||||
@ -59031,6 +59039,14 @@ machine.</seg>
|
||||
<seg>Mode « Smerge »</seg>
|
||||
</tuv>
|
||||
</tu>
|
||||
<tu>
|
||||
<tuv lang="en">
|
||||
<seg>Smerge mode provides commands to resolve conflicts by selecting specific changes.</seg>
|
||||
</tuv>
|
||||
<tuv lang="fr" changeid="Lilian" changedate="20220517T140002Z" creationid="Lilian" creationdate="20220517T140002Z">
|
||||
<seg>Le mode « Smerge » fournit des commandes pour résoudre des conflits en sélectionnant des changements spécifiques.</seg>
|
||||
</tuv>
|
||||
</tu>
|
||||
<tu>
|
||||
<tuv lang="en">
|
||||
<seg>So @code{(mode .</seg>
|
||||
|
Loading…
Reference in New Issue
Block a user