mirror of
https://github.com/git/git.git
synced 2024-11-15 13:43:45 +01:00
18 lines
279 B
Text
18 lines
279 B
Text
|
can_diff () {
|
||
|
|
return 1
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
if $base_present
|
||
|
|
then
|
||
|
|
touch "$BACKUP"
|
||
|
|
"$merge_tool_path" \
|
||
|
|
-base:"$BASE" -mine:"$LOCAL" \
|
||
|
|
-theirs:"$REMOTE" -merged:"$MERGED"
|
||
|
|
check_unchanged
|
||
|
|
else
|
||
|
|
echo "TortoiseMerge cannot be used without a base" 1>&2
|
||
|
|
return 1
|
||
|
|
fi
|
||
|
|
}
|