| Linux server.clickboxgo.com 3.10.0 #1 SMP Mon Sep 30 15:36:27 MSK 2024 x86_64 Path : /proc/2/cwd/usr/libexec/git-core/mergetools/ |
| Current File : //proc/2/cwd/usr/libexec/git-core/mergetools/opendiff |
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}
merge_cmd () {
touch "$BACKUP"
if $base_present
then
"$merge_tool_path" "$LOCAL" "$REMOTE" \
-ancestor "$BASE" -merge "$MERGED" | cat
else
"$merge_tool_path" "$LOCAL" "$REMOTE" \
-merge "$MERGED" | cat
fi
check_unchanged
}