Sign in
googlers
/
jrn
/
git
/
b1d9b1d0f1880c753d5146e8af63b9dc72803e4a
/
.
/
mergetools
/
tkdiff
blob: 618c438e8765a485ffcc70a105fb0cf46010540c [
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
}