Sign in
code
/
git
/
v1.8.0.3
/
.
/
mergetools
/
defaults
blob: 21e63ecc3e019252c5c9ab5c26b1ea72f5952cc7 [
file
] [
log
] [
blame
]
# Redefined by builtin tools
can_merge
()
{
return
0
}
can_diff
()
{
return
0
}
diff_cmd
()
{
status
=
1
return
$status
}
merge_cmd
()
{
status
=
1
return
$status
}
translate_merge_tool_path
()
{
echo
"$1"
}