ÿØÿà JFIF 

  
 
  ÿÛ C      

!"$"$ÿÛ C
  ÿÂ p 
" 

ÿÄ  

 

          
 ÿÄ 


 

           
ÿÚ 
   
ÕÔË®
(%	aA*‚XYD¡(J„¡E¢RE,P€XYae )(E¤²€B¤R¥	BQ¤¢ X«)X…€¤   
@  

  ..............................................................................................................................................................................
.............................................................................                                                  
                                                                                                                                                                                     ÿØÿà JFIF 

  
 
  ÿÛ C      

!"$"$ÿÛ C
  ÿÂ p 
" 

ÿÄ  

 

          
 ÿÄ 


 

           
ÿÚ 
   
ÕÔË®
(%	aA*‚XYD¡(J„¡E¢RE,P€XYae )(E¤²€B¤R¥	BQ¤¢ X«)X…€¤   
@  

  ..............................................................................................................................................................................
.............................................................................                                                  
                                                                                                                                                                                     diff_cmd () {
	"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
}

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