Araxis Merge File Comparison Report
0
2017-10-05 09:48:46 +0000
mac
0
0
1
1
0
0
1
0
1
1
^[ \t]*$
Blank lines
[ \t]*//[^"]*$
C++ comments
^[ \t]*//.*\$(Date|Archive|Author|Header|JustDate|Modtime|Revision|Workfile):.*\$.*$
SourceSafe comments
\$(Archive|Author|Date|Header|JustDate|Logfile|Modtime|Revision|Workfile):[^$]*\$
SourceSafe keywords
^[ \t]*'.*$
Visual Basic comments
\$(Author|Date|Header|Id|Locker|Name|RCSfile|Revision|Source|State):[^$]*\$
CVS comments
\$(ACident|ACheader|AClog|ACpart|ACversion|Author|Date|Header|Line|Locker|Log|Revision|Smsfile|Smspath|Today|Vcfile|Vcpath|Workfile):?[^$]*\$
AllChange keywords
eustace1.txt
/Users/merge/Test
2017-10-05 09:48:06 +0000
eustace2.txt
/Users/merge/Test
2017-10-05 09:48:19 +0000
#000000
#FFFFFF
Menlo
normal
normal
8.250000pt
none
#800000
#F3E6D8
Menlo
normal
normal
8.250000pt
none
#800000
#D1E8CF
Menlo
normal
normal
8.250000pt
none
#800000
#DACDE6
Menlo
normal
normal
8.250000pt
none
#000000
#FFFFFF
Menlo
normal
normal
8.250000pt
none
#800000
#F3E6D8
Menlo
normal
normal
8.250000pt
none
#800000
#D1E8CF
Menlo
normal
normal
8.250000pt
none
#800000
#DACDE6
Menlo
normal
normal
8.250000pt
none
Eustace,apointy-earedhippopotamus,was
Eustace,apointy-earedhippopotamus,was
scamperingacrossasummermeadowoneday
scamperingacrossasummermeadowoneday
whenhesuddenlycameacrossastream.
whenhesuddenlycameacrossastream.
Eustacealmostfellintothestream,but
skiddedtoahaltjustintime.
Sittingonarockinthemiddleofthe
Sittingonarockinthemiddleofthe
streamwasasmallgreenfrog,baskinginthe
streamwasasmallbluefrog,baskinginthe
afternoonsunshine.
afternoonsunshine.
"Hellosmallgreenfrog!",saidEustace."What
"Hellosmallbluefrog!",saidEustace."What
areyoudoingthere?"
areyoudoingthere?"
Froggydidn'tanswer,soEustacetrodonhim
andwanderedoffintothenearbyforesttolook
forwildonions.