| Linux webhost1.zalaszam.hu 5.4.0-216-generic #236-Ubuntu SMP Fri Apr 11 19:53:21 UTC 2025 x86_64 Path : /lib/git-core/mergetools/ |
| Current File : //lib/git-core/mergetools/diffuse |
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" \
"$LOCAL" "$MERGED" "$REMOTE" \
"$BASE" | cat
else
"$merge_tool_path" \
"$LOCAL" "$MERGED" "$REMOTE" | cat
fi
}