зеркало из https://github.com/microsoft/git.git
8 строки
83 B
Plaintext
8 строки
83 B
Plaintext
|
can_merge () {
|
||
|
|
return 1
|
||
|
|
}
|
||
|
|
|
||
|
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
||
|
|
}
|