60 lines
4.5 KiB
Plaintext
60 lines
4.5 KiB
Plaintext
|
|
|||
|
|
a
|
|||
|
|
<EFBFBD> 0.0.0 <00><><EFBFBD><EFBFBD> <00><>0v<30>,<2C>|p<><70> A <0B>@<40>3 <00> 7 <00><><EFBFBD><EFBFBD><EFBFBD> <00> <00> <00><> <00> E <00> <00> <00>) <00> . <00>2 <00> ; a <00> <00> <00>) <00> . <00>2 <00> <00> <00>r <00> <00> <00>) <00> . <00>2
|
|||
|
|
<00> H <00><> <00><><EFBFBD><EFBFBD><EFBFBD> <01> 1 <00>1 <00><><EFBFBD><EFBFBD><EFBFBD> @ <00> <00> <00>
Q <00>j <00> <00> <00>P <00><><EFBFBD><EFBFBD> <01> 1 <00>1 <00><><EFBFBD><EFBFBD><EFBFBD> <01> <00> <00> <00> <00>j <00><><EFBFBD><EFBFBD><EFBFBD> <01> b <00> <00><><EFBFBD><EFBFBD><EFBFBD> <01> H <00>x <00><><EFBFBD><EFBFBD> <01> 1 <00>1 <00><><EFBFBD><EFBFBD><EFBFBD> @ <00> <00> <00> Q <00>j <00> H <00>} <00><><EFBFBD><EFBFBD> <01> 1 <00>1 <00><><EFBFBD><EFBFBD><EFBFBD> @ <00> <00> <00> Q <00>j <00> H <00><> <00><><EFBFBD><EFBFBD> <01> 1 <00>1 <00><><EFBFBD><EFBFBD><EFBFBD> @ <00> <00> <00> Q <00>j <00> y <00>
|
|||
|
|
<00> <00> <00>) ! <00> . <00>2 " <00> <00><> <00><><EFBFBD><EFBFBD># @ 1 <00>1 <00><><EFBFBD><EFBFBD><EFBFBD>$ <00> <00> <00> % . <00>j <00> & H <00><> <00><><EFBFBD><EFBFBD>' <01> 1 <00>1 <00><><EFBFBD><EFBFBD><EFBFBD>( @ <00> <00> <00> ) Q <00>j <00> * H <00><> <00><><EFBFBD><EFBFBD>+ <01> 1 <00>1 <00><><EFBFBD><EFBFBD><EFBFBD>, @ <00> <00> <00> - Q <00>j <00> . H <00><> <00><><EFBFBD><EFBFBD>/ <01> 1 <00>1 <00><><EFBFBD><EFBFBD><EFBFBD>0 @ <00> <00> <00> 1 Q <00>j <00> 2 TextScriptImporter PPtr<EditorExtension> m_FileID m_PathID PPtr<PrefabInstance> m_ExternalObjects SourceAssetIdentifier type assembly name m_UsedFileIDs m_UserData m_AssetBundleName m_AssetBundleVariant 1 <00><> e F<08>_1Ch_މ<5F>$ = O <00>7 <00><><EFBFBD><EFBFBD><EFBFBD> <00> <00> <00><> <00> E <00> <00> <00> <00> . <00> <00> ( a <00> <00> <00> <00> . <00> <00> <00> <00>r <00> <00> <00> <00> . <00>
|
|||
|
|
<00> H <00><> <00><><EFBFBD><EFBFBD><EFBFBD> <01> 1 <00>1 <00><><EFBFBD><EFBFBD><EFBFBD> @ <00> <00> <00>
Q <00>j <00> H <00><> <00><><EFBFBD><EFBFBD><EFBFBD> <01> 1 <00>1 <00><><EFBFBD><EFBFBD><EFBFBD> @ <00> <00> <00> Q <00>j <00> PPtr<EditorExtension> m_FileID m_PathID PPtr<PrefabInstance> H <00><>J P , <00><>J binmergetool.es <00> == Error ==
|
|||
|
|
Error
|
|||
|
|
|
|||
|
|
== NoResultFileSelected ==
|
|||
|
|
No se ha seleccionado un documento como resultado del merge.
|
|||
|
|
|
|||
|
|
== UsageCaption ==
|
|||
|
|
Uso
|
|||
|
|
|
|||
|
|
== Usage ==
|
|||
|
|
Uso: binmergetool <opciones>
|
|||
|
|
|
|||
|
|
opciones: <ficheros> <ficheroBase> [<nombreBase>] [[<automatic>] <ficheroResultado>] [<mergeType>] [<opciones>]
|
|||
|
|
|
|||
|
|
baseFile: {-b | --base}=<filename>
|
|||
|
|
baseSymbolicName: {-bn | --basesymbolicname}=<symbolicname>
|
|||
|
|
automatic: -a | --automatic
|
|||
|
|
resultFile: {-r | --result}=<filename>
|
|||
|
|
mergeType: {-m | --mergeresolutiontype}={onlyone | onlysrc | onlydst | try | forced}
|
|||
|
|
|
|||
|
|
ficheros: <origen> [<nombreOrigen>] <destino> [<nombreDestino>]
|
|||
|
|
|
|||
|
|
origen: {-s | --source}=<nombreFichero>
|
|||
|
|
nombreOrigen: {-sn | --srcsymbolicname}=<nombre>
|
|||
|
|
destino: {-d | --destination}=<nombreFichero>
|
|||
|
|
nombreDestino: {-dn | --dstsymbolicname}=<nombre>
|
|||
|
|
|
|||
|
|
|
|||
|
|
Examples:
|
|||
|
|
|
|||
|
|
binmergetool -s=file1.txt -d=file2.txt
|
|||
|
|
binmergetool -s=file1.txt -b=file0.txt --destination=file2.txt
|
|||
|
|
binmergetool --base=file0.txt -d=file2.txt --source=file1.txt --automatic --result=result.txt
|
|||
|
|
binmergetool -b=file0.txt -s=file1.txt -d=file2.txt -a -r=result.txt -m=onlyone
|
|||
|
|
|
|||
|
|
== DiffRequiresTwoArguments ==
|
|||
|
|
Se necesitan dos ficheros para hacer diferencias
|
|||
|
|
|
|||
|
|
== UnsupportedFileTypeForDiff ==
|
|||
|
|
Tipo de ficheros no soportado para obtener diferencias
|
|||
|
|
|
|||
|
|
== SaveChanges ==
|
|||
|
|
¿Desea guardar los cambios en el fichero resultado?
|
|||
|
|
|
|||
|
|
== ExitPrompt ==
|
|||
|
|
Salir...
|
|||
|
|
|
|||
|
|
== CantLoadImage ==
|
|||
|
|
No se puede cargar la imagen '{0}'.
|
|||
|
|
|
|||
|
|
== NoArguments ==
|
|||
|
|
No se especificaron argumentos
|
|||
|
|
|
|||
|
|
== UsageHint ==
|
|||
|
|
Utilice [binmergetool -?] para mostrar la ayuda para esta herramienta
|