12 lines
117 B
Text
12 lines
117 B
Text
|
can_merge () {
|
||
|
|
return 1
|
||
|
|
}
|
||
|
|
|
||
|
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
||
|
|
}
|
||
|
|
|
||
|
|
exit_code_trustable () {
|
||
|
|
true
|
||
|
|
}
|