Mini Shell
Mini Shell
| Direktori : /proc/self/root/proc/thread-self/root/proc/self/root/usr/libexec/git-core/mergetools/ |
| Current File : //proc/self/root/proc/thread-self/root/proc/self/root/usr/libexec/git-core/mergetools/bc3 |
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
merge_cmd () {
touch "$BACKUP"
if $base_present
then
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
-mergeoutput="$MERGED"
else
"$merge_tool_path" "$LOCAL" "$REMOTE" \
-mergeoutput="$MERGED"
fi
check_unchanged
}
translate_merge_tool_path() {
if type bcomp >/dev/null 2>/dev/null
then
echo bcomp
else
echo bcompare
fi
}