60 lines
4.5 KiB
Plaintext
60 lines
4.5 KiB
Plaintext
|
|
|||
|
|
a
|
|||
|
|
0.0.0 þÿÿÿ ÿÿ0v²,¾|pØä A Ê@Ã3 Ë 7 €ÿÿÿÿ € ¦ €² € E € Þ €) € . €2 € ; a € Þ €) € . €2 € † €r € Þ €) € . €2
|
|||
|
|
€ H €« €ÿÿÿÿ € 1 €1 €ÿÿÿÿ @ Þ € €
|
|||
|
|
Q €j € ñ €P ÿÿÿÿ À 1 €1 €ÿÿÿÿ € Þ € € €j €ÿÿÿÿ € b › €ÿÿÿÿ € H €x ÿÿÿÿ € 1 €1 €ÿÿÿÿ @ Þ € € Q €j € H €} ÿÿÿÿ € 1 €1 €ÿÿÿÿ @ Þ € € Q €j € H €† ÿÿÿÿ € 1 €1 €ÿÿÿÿ @ Þ € € Q €j € y €
|
|||
|
|
€ Þ €) ! € . €2 " € €‹ ÿÿÿÿ# @ 1 €1 €ÿÿÿÿ$ Þ € € % . €j € & H €™ ÿÿÿÿ' € 1 €1 €ÿÿÿÿ( @ Þ € € ) Q €j € * H €¤ ÿÿÿÿ+ € 1 €1 €ÿÿÿÿ, @ Þ € € - Q €j € . H €¶ ÿÿÿÿ/ € 1 €1 €ÿÿÿÿ0 @ Þ € € 1 Q €j € 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 ÿÿ e F¼_1Ch_Þ‰Ž$ = O €7 €ÿÿÿÿ € ¦ €² € E € Þ € € . € € ( a € Þ € € . € € † €r € Þ € € . €
|
|||
|
|
€ H €« €ÿÿÿÿ € 1 €1 €ÿÿÿÿ @ Þ € €
|
|||
|
|
Q €j € H €ê €ÿÿÿÿ € 1 €1 €ÿÿÿÿ @ Þ € € Q €j € PPtr<EditorExtension> m_FileID m_PathID PPtr<PrefabInstance> H ÄJ H ÄJ binmergetool.en Ý ï»¿== Error ==
|
|||
|
|
Error
|
|||
|
|
|
|||
|
|
== NoResultFileSelected ==
|
|||
|
|
No result file has been selected
|
|||
|
|
|
|||
|
|
== UsageCaption ==
|
|||
|
|
Usage
|
|||
|
|
|
|||
|
|
== Usage ==
|
|||
|
|
Usage: binmergetool <mergeOptions>
|
|||
|
|
|
|||
|
|
mergeOptions: <generalFiles> <baseFile> [<baseSymbolicName>] [[<automatic>] <resultFile>] [<mergeType>] [<generalOptions>]
|
|||
|
|
|
|||
|
|
baseFile: {-b | --base}=<filename>
|
|||
|
|
baseSymbolicName: {-bn | --basesymbolicname}=<symbolicname>
|
|||
|
|
automatic: -a | --automatic
|
|||
|
|
resultFile: {-r | --result}=<filename>
|
|||
|
|
mergeType: {-m | --mergeresolutiontype}={onlyone | onlysrc | onlydst | try | forced}
|
|||
|
|
|
|||
|
|
generalFiles:<sourceFile> [<srcSymbolicName>] <destination> [<dstSymbolicName>]
|
|||
|
|
|
|||
|
|
sourceFile: {-s | --source}=<filename>
|
|||
|
|
srcSymbolicName: {-sn | --srcsymbolicname}=<symbolicname>
|
|||
|
|
destinationFile: {-d | --destination}=<filename>
|
|||
|
|
dstSymbolicName: {-dn | --dstsymbolicname}=<symbolicname>
|
|||
|
|
|
|||
|
|
|
|||
|
|
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 ==
|
|||
|
|
Differences need two and only two files
|
|||
|
|
|
|||
|
|
== UnsupportedFileTypeForDiff ==
|
|||
|
|
Unsupported file types for binary diff. Only images are supported (JPEG, PNG, GIF, BMP)
|
|||
|
|
|
|||
|
|
== SaveChanges ==
|
|||
|
|
Do you want to save changes to the result file?
|
|||
|
|
|
|||
|
|
== ExitPrompt ==
|
|||
|
|
Exit
|
|||
|
|
|
|||
|
|
== CantLoadImage ==
|
|||
|
|
Image '{0}' can't be loaded.
|
|||
|
|
|
|||
|
|
== NoArguments ==
|
|||
|
|
No arguments specified
|
|||
|
|
|