19 lines
		
	
	
		
			263 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			19 lines
		
	
	
		
			263 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
diff_cmd () {
 | 
						|
	"$merge_tool_path" "$LOCAL" "$REMOTE"
 | 
						|
}
 | 
						|
 | 
						|
merge_cmd () {
 | 
						|
	if $base_present
 | 
						|
	then
 | 
						|
		"$merge_tool_path" -s "$LOCAL" \
 | 
						|
		"$REMOTE" "$BASE" "$MERGED"
 | 
						|
	else
 | 
						|
		"$merge_tool_path" -m "$LOCAL" \
 | 
						|
		"$REMOTE" "$MERGED"
 | 
						|
	fi
 | 
						|
}
 | 
						|
 | 
						|
exit_code_trustable () {
 | 
						|
	true
 | 
						|
}
 |