Sign in
googlers
/
jrn
/
git
/
refs/tags/v2.14.1
/
.
/
mergetools
/
tkdiff
blob: eee5cb57e3ccf7f1ad7ad150c37a8b6d7ab6d436 [
file
] [
log
] [
blame
]
diff_cmd
()
{
"$merge_tool_path"
"$LOCAL"
"$REMOTE"
}
merge_cmd
()
{
if
$base_present
then
"$merge_tool_path"
-
a
"$BASE"
-
o
"$MERGED"
"$LOCAL"
"$REMOTE"
else
"$merge_tool_path"
-
o
"$MERGED"
"$LOCAL"
"$REMOTE"
fi
}
exit_code_trustable
()
{
true
}