Sign in
googlers
/
jrn
/
git
/
0d3505e286d64a351631fc8d7a5a92cb29832f16
/
.
/
mergetools
/
guiffy
blob: 8b23a13c4111bdecc700a4a1a4547e15760eba58 [
file
] [
log
] [
blame
]
diff_cmd
()
{
"$merge_tool_path"
"$LOCAL"
"$REMOTE"
}
merge_cmd
()
{
if
$base_present
then
"$merge_tool_path"
-
s
"$LOCAL"
\
"$REMOTE"
"$BASE"
"$MERGED"
else
"$merge_tool_path"
-
m
"$LOCAL"
\
"$REMOTE"
"$MERGED"
fi
}
exit_code_trustable
()
{
true
}