You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

7 lines
83 B

can_merge () {
return 1
}
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}