Sign in
googlers
/
jrn
/
git
/
5116eab70bf8a0c8b1c29a09c4b932c4d1cf2701
/
.
/
mergetools
/
diffuse
blob: 5a3ae8b5695d3141ff0310a706495ea52037b464 [
file
] [
log
] [
blame
]
diff_cmd
()
{
"$merge_tool_path"
"$LOCAL"
"$REMOTE"
|
cat
}
merge_cmd
()
{
if
$base_present
then
"$merge_tool_path"
\
"$LOCAL"
"$MERGED"
"$REMOTE"
\
"$BASE"
|
cat
else
"$merge_tool_path"
\
"$LOCAL"
"$MERGED"
"$REMOTE"
|
cat
fi
}