mirror of
https://github.com/git/git.git
synced 2024-11-01 06:47:52 +01:00
13 lines
224 B
Text
13 lines
224 B
Text
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
if $base_present
|
||
|
|
then
|
||
|
|
"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
|
||
|
|
else
|
||
|
|
"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
|
||
|
|
fi
|
||
|
|
}
|