589a6c78_undation___Flauschig_Dev__Blog__Name
[Arg.] %1 [Description] In diff, the pre-changes file, in merge, the “server” or “theirs” file, the file that is the base file after “their” changes were applied [Name] 
Original file
O r i g i n a l f i l e
M o d i f i e d f i l e
B a s e f i l e
M e r g e d f i l e
D i f f c o m m a n d - l i n e o p t i o n s
O r i g i n a l f i l e l a b e l
M o d i f i e d f i l e l a b e l
B a s e f i l e l a b e l
M e r g e d f i l e l a b e l
Custom Diff/Merge Tools in Team Foundation – Flauschig Dev. Blog
Name