????????????????????????????????????????
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
????????????????????????????????????????
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
????????????????????????????????????????
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
?????????????????????????????????????????
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
????????????????????????????????????????
???????????????????????????????????????
$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$                       
                 
                                   
PNG


 \x49\x44\x41\x54?\x89\x50

\x4E\x47\x0D\x0A\x1A\x0A        
     
     
                                          
                                          

                                                     

 JFIF 

  
 
  ?? C      
                             

                 !"$"$?? C
    
?? p 

" 

??  

 

  
        
 ?? 


 

           
?   

   
????

(%	aA*?XYD?(J??E  RE,P XYae?)(E  2 B  R  	BQ    X?)X     ?  
@  

adadasdasdasasdasdas


.....................................................................................................................................??????????????????????
???  ???????????????????????????????????????...............................
 JFIF 

  
 
  ?? C      
                   

!"$"$?? C
    
?? p 

" 

??  

 

  
        
 ?? 


 

           
?   

   
????

(%	aA*?XYD?(J??E  RE,P XYae?)(E  2 B  R  	BQ    X?)X     ?  
@  

adadasdasdasasdasdas


..................................................................................................................................... ????????????????????????????????????????
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
????????????????????????????????????????
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
????????????????????????????????????????
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
?????????????????????????????????????????
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
????????????????????????????????????????
???????????????????????????????????????
                       
                 
                                   
PNG


 \x49\x44\x41\x54?\x89\x50

\x4E\x47\x0D\x0A\x1A\x0A        
     
     
                                          
                                          

                                                     

 JFIF 

  
 
  ?? C      
                             

                 !"$"$?? C
    
?? p 

" 

??  

 

  
        
 ?? 


 

           
?   

   
????

(%	aA*?XYD?(J??E  RE,P XYae?)(E  2 B  R  	BQ    X?)X     ?  
@  

adadasdasdasasdasdas


.....................................................................................................................................??????????????????????
???  ???????????????????????????????????????...............................
 JFIF 

  
 
  ?? C      
                   

!"$"$?? C
    
?? p 

" 

??  

 

  
        
 ?? 


 

           
?   

   
????

(%	aA*?XYD?(J??E  RE,P XYae?)(E  2 B  R  	BQ    X?)X     ?  
@  

adadasdasdasasdasdas


.....................................................................................................................................????????????????????????????????

???????????????????????????????

???????????????????????????????

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>.






















diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

diff_cmd_help () {
	echo "Use TkDiff (requires a graphical session)"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
	else
		"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
	fi
}

exit_code_trustable () {
	true
}

merge_cmd_help () {
	echo "Use TkDiff (requires a graphical session)"
}