mirror of
https://github.com/git/git.git
synced 2024-11-09 02:33:11 +01:00
8 lines
83 B
Text
8 lines
83 B
Text
|
can_merge () {
|
||
|
|
return 1
|
||
|
|
}
|
||
|
|
|
||
|
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
||
|
|
}
|