Sign in
kernel
/
pub
/
scm
/
git
/
git
/
11738ddf4885c5bd02bdd3587c8765df70c3270e
/
.
/
mergetools
/
kompare
blob: 433686c12a088195bbf21b2e409c21df199ba988 [
file
] [
log
] [
blame
]
can_merge
()
{
return
1
}
diff_cmd
()
{
"$merge_tool_path"
"$LOCAL"
"$REMOTE"
}