mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
8 lines
83 B
Plaintext
8 lines
83 B
Plaintext
|
can_merge () {
|
||
|
|
return 1
|
||
|
|
}
|
||
|
|
|
||
|
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
||
|
|
}
|