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 8 <00><>J binmergetool.zh-Hans<6E> == Error ==
|
|||
|
|
错误
|
|||
|
|
|
|||
|
|
== NoResultFileSelected ==
|
|||
|
|
未选择结果文件
|
|||
|
|
|
|||
|
|
== UsageCaption ==
|
|||
|
|
用法
|
|||
|
|
|
|||
|
|
== 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>
|
|||
|
|
|
|||
|
|
|
|||
|
|
示例：
|
|||
|
|
|
|||
|
|
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 ==
|
|||
|
|
差异比较需要且只需要两个文件
|
|||
|
|
|
|||
|
|
== UnsupportedFileTypeForDiff ==
|
|||
|
|
二进制文件差异比较不支持的文件类型。仅支持图像（JPEG、PNG、GIF、BMP）
|
|||
|
|
|
|||
|
|
== SaveChanges ==
|
|||
|
|
是否要保存对结果文件所做的更改？
|
|||
|
|
|
|||
|
|
== ExitPrompt ==
|
|||
|
|
退出
|
|||
|
|
|
|||
|
|
== CantLoadImage ==
|
|||
|
|
无法加载图像 '{0}'。
|
|||
|
|
|
|||
|
|
== NoArguments ==
|
|||
|
|
未指定参数
|
|||
|
|
|
|||
|
|
== UsageHint ==
|
|||
|
|
使用 [binmergetool -?] 可显示有关此实用程序的更多帮助信息
|