>SetVar  "Setting_getDiffCmdLine", "ArgsLog"
%FullPath(..)%\_work\FilesB\Project - Synced\SyncFilesX_Setting.xml

t@C̈ꗗF
  ̋L̈Ӗ: [=] [!]قȂ [ ]s
  E̋L̈Ӗ: [*]ύX [+]ǉ [-]폜 [.]s [ ]s
  ̓x[XAE̓[N

1. [101]
x[Xibase_1j: "..\Project\Base\AA"
[Niwork_1j: "..\Project\Work\A"
1. .!* UpdateWork.txt

2. [202]
x[Xibase_2j: "..\Project\Base\BB"
[Niwork_2j: "..\Project\Work\B"
1. +=+ NewSame.txt

-------------------------------------------------------------------------------
1. [101] *
x[Xibase_1j: "..\Project\Base\AA"
[Niwork_1j: "..\Project\Work\A"
2. [202] *
x[Xibase_2j: "..\Project\Base\BB"
[Niwork_2j: "..\Project\Work\B"

91. ăXL [Rescan]
93. ׂẴ[Nt@C̈ꗗt@Cɏo͂
99. I
Zbg̔ԍ >1
-------------------------------------------------------------------------------
%FullPath(..)%\_work\FilesB\Project - Synced
OR~bg̃x[X: "Base\AA"
OR~bg̃[N: "Work\A"
-------------------------------------------------------------------------------
x[Xibase_1j: "..\Project\Base\AA"
[Niwork_1j: "..\Project\Work\A"
1. .!*  UpdateWork.txt

91. ăXL [Rescan]
92. [gEtH_[J
93. 󋵂𕪐͂ [Analyze]
96.  }[WăR~bg [AutoMerge]
99. ߂
ԍ >1
-------------------------------------------------------------------------------
x[XF"%FullPath(..)%\_work\FilesB\Project\Base\AA\UpdateWork.txt"
[NF"%FullPath(..)%\_work\FilesB\Project\Work\A\UpdateWork.txt"
x[X t@Cƃ[N t@ĆuevłB
̃j[ 1.ŊJQ̃t@C蓮œAR~bgĂB
-------------------------------------------------------------------------------
x[Xibase_1j: UpdateWork.txt (.s)
[Niwork_1j: UpdateWork.txt (*ύX)

1. Diff ŊJFt@C (!قȂ) [ x[X / [N ]
2. Diff ŊJFOR~bg̓e (=) [ x[X / [N ]
4. Diff ŊJFx[X (.s) [ OR~bg /  ]
5. Diff ŊJF[N (*ύX) [ OR~bg /  ]
44.Diff ŊJF[ OR~bg̃x[X / x[X / [N ]
55.Diff ŊJF[ x[X / [N / OR~bg̃[N ]
6. t@C܂̓tH_[J
Enter̂: ăXL
8. R~bg
9. ߂
ԍ >9
-------------------------------------------------------------------------------
%FullPath(..)%\_work\FilesB\Project - Synced
OR~bg̃x[X: "Base\AA"
OR~bg̃[N: "Work\A"
-------------------------------------------------------------------------------
x[Xibase_1j: "..\Project\Base\AA"
[Niwork_1j: "..\Project\Work\A"
1. .!*  UpdateWork.txt

91. ăXL [Rescan]
92. [gEtH_[J
93. 󋵂𕪐͂ [Analyze]
96.  }[WăR~bg [AutoMerge]
99. ߂
ԍ >99
-------------------------------------------------------------------------------
1. [101] *
x[Xibase_1j: "..\Project\Base\AA"
[Niwork_1j: "..\Project\Work\A"
2. [202] *
x[Xibase_2j: "..\Project\Base\BB"
[Niwork_2j: "..\Project\Work\B"

91. ăXL [Rescan]
93. ׂẴ[Nt@C̈ꗗt@Cɏo͂
99. I
Zbg̔ԍ >2
-------------------------------------------------------------------------------
%FullPath(..)%\_work\FilesB\Project - Synced
OR~bg̃x[X: ".\BaseSub\BB"
OR~bg̃[N: ".\WorkSub\B"
-------------------------------------------------------------------------------
x[Xibase_2j: "..\Project\Base\BB"
[Niwork_2j: "..\Project\Work\B"
1. +=+  NewSame.txt

91. ăXL [Rescan]
92. [gEtH_[J
93. 󋵂𕪐͂ [Analyze]
98.  x[Xƃ[Nt@CׂăR~bg [AutoCommit]
99. ߂
ԍ >1
-------------------------------------------------------------------------------
x[XF"%FullPath(..)%\_work\FilesB\Project\Base\BB\NewSame.txt"
[NF"%FullPath(..)%\_work\FilesB\Project\Work\B\NewSame.txt"

̃j[ 1.ŊJQ̃t@C蓮œAR~bgĂB
-------------------------------------------------------------------------------
x[Xibase_2j: NewSame.txt (+VK)
[Niwork_2j: NewSame.txt (+VK)

1. Diff ŊJFt@C (=) [ x[X / [N ]
2. Diff ŊJFOR~bg̓e ( Ȃ) [ x[X / [N ]
4. Diff ŊJFx[X (+VK) [ OR~bg /  ]
5. Diff ŊJF[N (+VK) [ OR~bg /  ]
44.Diff ŊJF[ OR~bg̃x[X / x[X / [N ]
55.Diff ŊJF[ x[X / [N / OR~bg̃[N ]
6. t@C܂̓tH_[J
Enter̂: ăXL
8. R~bg
9. ߂
EEEړƂ SyncFilesX ̐QlB
ԍ >8
-------------------------------------------------------------------------------
>copy_ren  "%FullPath(..)%\_work\FilesB\Project\Work\B\NewSame.txt", "%FullPath(..)%\_work\FilesB\Project - Synced\WorkSub\B\NewSame.txt"
>copy_ren  "%FullPath(..)%\_work\FilesB\Project\Base\BB\NewSame.txt", "%FullPath(..)%\_work\FilesB\Project - Synced\BaseSub\BB\NewSame.txt"
R~bg܂B
-------------------------------------------------------------------------------
x[XF"%FullPath(..)%\_work\FilesB\Project\Base\BB\NewSame.txt"
[NF"%FullPath(..)%\_work\FilesB\Project\Work\B\NewSame.txt"
x[X t@Cƃ[N t@ĆuevłB
R~bg܂B
-------------------------------------------------------------------------------
x[Xibase_2j: NewSame.txt (.s)
[Niwork_2j: NewSame.txt (.s)

1. Diff ŊJFt@C (=) [ x[X / [N ]
2. Diff ŊJFOR~bg̓e (=) [ x[X / [N ]
4. Diff ŊJFx[X (.s) [ OR~bg /  ]
5. Diff ŊJF[N (.s) [ OR~bg /  ]
44.Diff ŊJF[ OR~bg̃x[X / x[X / [N ]
55.Diff ŊJF[ x[X / [N / OR~bg̃[N ]
6. t@C܂̓tH_[J
Enter̂: ăXL
8. R~bg
9. ߂
ԍ >9
-------------------------------------------------------------------------------
%FullPath(..)%\_work\FilesB\Project - Synced
OR~bg̃x[X: ".\BaseSub\BB"
OR~bg̃[N: ".\WorkSub\B"
-------------------------------------------------------------------------------
x[Xibase_2j: "..\Project\Base\BB"
[Niwork_2j: "..\Project\Work\B"
Ȃij

91. ăXL [Rescan]
92. [gEtH_[J
93. 󋵂𕪐͂ [Analyze]
97. ׂẴt@C\
99. ߂
ԍ >99
-------------------------------------------------------------------------------
1. [101] *
x[Xibase_1j: "..\Project\Base\AA"
[Niwork_1j: "..\Project\Work\A"
2. [202] 
x[Xibase_2j: "..\Project\Base\BB"
[Niwork_2j: "..\Project\Work\B"

91. ăXL [Rescan]
93. ׂẴ[Nt@C̈ꗗt@Cɏo͂
99. I
Zbg̔ԍ >99
-------------------------------------------------------------------------------
Pass.
